[libvirt] [PATCH] Only set QEMU_CAPS_NO_HPET on x86

[Martin Kletzander]

On Thu, Apr 17, 2014 at 04:57:15PM +0200, Ján Tomko wrote:
>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
>---
> src/qemu/qemu_capabilities.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
>index 381b3ec..60b56fc 100644
>--- a/src/qemu/qemu_capabilities.c
>+++ b/src/qemu/qemu_capabilities.c
>@@ -2888,7 +2888,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);
>@@ -2947,6 +2946,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);
>     }
>
>--
>1.8.3.2
>

ACK,

Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140418/e2d56847/attachment-0001.sig>