diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-21 02:51:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-21 02:51:18 +0000 |
| commit | 9149ac6ab5da49a82b4ece90880c2b0a43308a76 (patch) | |
| tree | b9099ac28c8929e062279bf4767d0de51e7271d8 /nova/virt/libvirt/driver.py | |
| parent | f372c84f1d480a845d0826758097e33893f25198 (diff) | |
| parent | ec48e1523dfdd0f1031e1a70c28c56962db66e8a (diff) | |
| download | nova-9149ac6ab5da49a82b4ece90880c2b0a43308a76.tar.gz | |
Merge "workarounds: Add libvirt_disable_apic"
Diffstat (limited to 'nova/virt/libvirt/driver.py')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 6394885918..21832c2489 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -5858,7 +5858,8 @@ class LibvirtDriver(driver.ComputeDriver): if CONF.libvirt.virt_type in ('qemu', 'kvm'): guest.features.append(vconfig.LibvirtConfigGuestFeatureACPI()) - guest.features.append(vconfig.LibvirtConfigGuestFeatureAPIC()) + if not CONF.workarounds.libvirt_disable_apic: + guest.features.append(vconfig.LibvirtConfigGuestFeatureAPIC()) if CONF.libvirt.virt_type in ('qemu', 'kvm') and os_type == 'windows': hv = vconfig.LibvirtConfigGuestFeatureHyperV() |