summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2011-12-20 12:08:29 +1100
committerEric Blake <eblake@redhat.com>2011-12-20 12:33:55 -0700
commit5abbe04d68c7dadd1d593fb009288001de82fc34 (patch)
tree9e558c3b61a020b148412c9f15b764b46ee14492 /tests/qemuxmlnstest.c
parentadd new command numatune to virsh (diff)
downloadlibvirt-5abbe04d68c7dadd1d593fb009288001de82fc34.tar.gz
libvirt-5abbe04d68c7dadd1d593fb009288001de82fc34.tar.bz2
libvirt-5abbe04d68c7dadd1d593fb009288001de82fc34.zip
qemu: Add a capability flag for -no-acpi
Currently non-x86 guests must have <acpi/> defined in <features> to prevent libvirt from running qemu with -no-acpi. Although it works, it is a hack. Instead add a capability flag which indicates whether qemu understands the -no-acpi option. Use it to control whether libvirt emits -no-acpi. Current versions of qemu always display -no-acpi in their help output, so this patch has no effect. However the development version of qemu has been modified such that -no-acpi is only displayed when it is actually supported. Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Diffstat (limited to 'tests/qemuxmlnstest.c')
-rw-r--r--tests/qemuxmlnstest.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c
index 86cf9740c..0432cc42f 100644
--- a/tests/qemuxmlnstest.c
+++ b/tests/qemuxmlnstest.c
@@ -89,6 +89,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
qemuCapsSetList(extraFlags,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
+ QEMU_CAPS_NO_ACPI,
QEMU_CAPS_LAST);
if (qemudCanonicalizeMachine(&driver, vmdef) < 0)