mirror of
https://github.com/libvirt/libvirt.git
synced 2026-10-02 12:20:06 -05:00
Only set QEMU_CAPS_NO_HPET on x86
QEMU only supports it on x86, but we've been assuming it for
all QEMUs when doing QMP capability detection.
https://bugzilla.redhat.com/show_bug.cgi?id=1066145
(cherry picked from commit c3725db8d0)
This commit is contained in:
1 parent
18dfd38f38
commit
a91c1f19a8
1 file changed
+1
-1
@@ -2431,7 +2431,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV);
|
||||
@@ -2490,6 +2489,7 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps,
|
||||
qemuCaps->arch == VIR_ARCH_I686) {
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user