openstack
/
nova
Code Issues Proposed changes

libvirt: move setting of guest features out into helper method 

Move guest features into a separate helper method, since there
will be more complicated guest features to be set in the guest
config in the future.

Related-bug: #1400315
Change-Id: Icf575ab1d6eb2a011c08efd998997d0d82aa15a6
This commit is contained in:
Daniel P. Berrange 2014-12-08 13:55:45 +00:00
parent 189b682ff3
commit 31d91d9de3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nova/virt/libvirt/driver.py
View File

@ -3665,6 +3665,16 @@ class LibvirtDriver(driver.ComputeDriver):
tmhyperv.present = True
clk.add_timer(tmhyperv)
def _set_features(self, guest, caps, virt_type):
if virt_type == "xen":
# PAE only makes sense in X86
if caps.host.cpu.arch in (arch.I686, arch.X86_64):
guest.features.append(vconfig.LibvirtConfigGuestFeaturePAE())
if virt_type not in ("lxc", "uml"):
guest.features.append(vconfig.LibvirtConfigGuestFeatureACPI())
guest.features.append(vconfig.LibvirtConfigGuestFeatureAPIC())
def _create_serial_console_devices(self, guest, instance, flavor,
image_meta):
if CONF.serial_console.enabled:
@ -3837,10 +3847,6 @@ class LibvirtDriver(driver.ComputeDriver):
if guest.os_type == vm_mode.HVM:
guest.os_loader = CONF.libvirt.xen_hvmloader_path
# PAE only makes sense in X86
if caps.host.cpu.arch in (arch.I686, arch.X86_64):
guest.features.append(vconfig.LibvirtConfigGuestFeaturePAE())
if virt_type in ("kvm", "qemu"):
if caps.host.cpu.arch in (arch.I686, arch.X86_64):
guest.sysinfo = self._get_guest_config_sysinfo(instance)
@ -3864,10 +3870,7 @@ class LibvirtDriver(driver.ComputeDriver):
else:
guest.os_boot_dev = blockinfo.get_boot_order(disk_info)
if virt_type not in ("lxc", "uml"):
guest.features.append(vconfig.LibvirtConfigGuestFeatureACPI())
guest.features.append(vconfig.LibvirtConfigGuestFeatureAPIC())
self._set_features(guest, caps, virt_type)
self._set_clock(guest, instance.os_type, image_meta, virt_type)
storage_configs = self._get_guest_storage_config(