From: Li Zhang Date: Thu, 20 Dec 2012 06:02:24 +0000 (+0800) Subject: Remove QEMU_CAPS_NO_ACPI capability for non-x86 platform X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c4bbaaf8772da4d67092748bebada520bb19debd;p=libvirt.git Remove QEMU_CAPS_NO_ACPI capability for non-x86 platform ACPI is only supported on x86 platform, PPC can't support it. So QEMU_CAPS_NO_ACPI shouldn't be set. This patch is to remove QEMU_CAPS_NO_ACPI capability for non-x86 platform. Signed-off-by: Li Zhang --- diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50d999a719..a6ac169da2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2260,7 +2260,13 @@ qemuCapsInitQMPBasic(qemuCapsPtr caps) qemuCapsSet(caps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC); qemuCapsSet(caps, QEMU_CAPS_NO_SHUTDOWN); qemuCapsSet(caps, QEMU_CAPS_DRIVE_CACHE_UNSAFE); - qemuCapsSet(caps, QEMU_CAPS_NO_ACPI); + + /* ACPI is only supported on x86, PPC or + * other platforms don't support it*/ + if (caps->arch == VIR_ARCH_I686 || + caps->arch == VIR_ARCH_X86_64) + qemuCapsSet(caps, QEMU_CAPS_NO_ACPI); + qemuCapsSet(caps, QEMU_CAPS_FSDEV_READONLY); qemuCapsSet(caps, QEMU_CAPS_VIRTIO_BLK_SG_IO); qemuCapsSet(caps, QEMU_CAPS_DRIVE_COPY_ON_READ);