diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2011-12-20 12:08:29 +1100 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2011-12-20 12:33:55 -0700 |
commit | 5abbe04d68c7dadd1d593fb009288001de82fc34 (patch) | |
tree | 9e558c3b61a020b148412c9f15b764b46ee14492 /tests/qemuhelptest.c | |
parent | add new command numatune to virsh (diff) | |
download | libvirt-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/qemuhelptest.c')
-rw-r--r-- | tests/qemuhelptest.c | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 4258fc9e7..f31c9037f 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -81,11 +81,12 @@ static int testHelpStrParsing(const void *data) goto cleanup; if (STRNEQ(got, expected)) { - fprintf(stderr, - "%s: computed flags do not match: got %s, expected %s\n", - info->name, got, expected); + if (virTestGetVerbose() || virTestGetDebug()) + fprintf(stderr, + "%s: computed flags do not match: got %s, expected %s\n", + info->name, got, expected); - if (getenv("VIR_TEST_DEBUG")) + if (virTestGetDebug()) printMismatchedFlags(flags, info->flags); goto cleanup; @@ -145,7 +146,8 @@ mymain(void) QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, QEMU_CAPS_DRIVE, - QEMU_CAPS_NAME); + QEMU_CAPS_NAME, + QEMU_CAPS_NO_ACPI); DO_TEST("kvm-74", 9001, 1, 74, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -158,7 +160,8 @@ mymain(void) QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_MEM_PATH, QEMU_CAPS_TDF, - QEMU_CAPS_NO_SHUTDOWN); + QEMU_CAPS_NO_SHUTDOWN, + QEMU_CAPS_NO_ACPI); DO_TEST("kvm-83-rhel56", 9001, 1, 83, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -185,7 +188,8 @@ mymain(void) QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_SPICE, - QEMU_CAPS_NO_SHUTDOWN); + QEMU_CAPS_NO_SHUTDOWN, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-0.10.5", 10005, 0, 0, QEMU_CAPS_KQEMU, QEMU_CAPS_VNC_COLON, @@ -205,7 +209,8 @@ mymain(void) QEMU_CAPS_RTC_TD_HACK, QEMU_CAPS_NO_HPET, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_NO_SHUTDOWN); + QEMU_CAPS_NO_SHUTDOWN, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-kvm-0.10.5", 10005, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -231,7 +236,8 @@ mymain(void) QEMU_CAPS_TDF, QEMU_CAPS_NESTING, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_NO_SHUTDOWN); + QEMU_CAPS_NO_SHUTDOWN, + QEMU_CAPS_NO_ACPI); DO_TEST("kvm-86", 10050, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -257,7 +263,8 @@ mymain(void) QEMU_CAPS_NESTING, QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_NO_SHUTDOWN); + QEMU_CAPS_NO_SHUTDOWN, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-kvm-0.11.0-rc2", 10092, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -288,7 +295,8 @@ mymain(void) QEMU_CAPS_NAME_PROCESS, QEMU_CAPS_SMBIOS_TYPE, QEMU_CAPS_VGA_NONE, - QEMU_CAPS_NO_SHUTDOWN); + QEMU_CAPS_NO_SHUTDOWN, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-0.12.1", 12001, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -320,7 +328,8 @@ mymain(void) QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_PCI_ROMBAR); + QEMU_CAPS_PCI_ROMBAR, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -366,7 +375,8 @@ mymain(void) QEMU_CAPS_PIIX4_USB_UHCI, QEMU_CAPS_USB_HUB, QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_PCI_ROMBAR); + QEMU_CAPS_PCI_ROMBAR, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -405,7 +415,8 @@ mymain(void) QEMU_CAPS_MIGRATE_QEMU_FD, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_PCI_ROMBAR); + QEMU_CAPS_PCI_ROMBAR, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -460,7 +471,8 @@ mymain(void) QEMU_CAPS_PCI_OHCI, QEMU_CAPS_USB_HUB, QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_PCI_ROMBAR); + QEMU_CAPS_PCI_ROMBAR, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -511,7 +523,8 @@ mymain(void) QEMU_CAPS_PIIX4_USB_UHCI, QEMU_CAPS_USB_HUB, QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_PCI_ROMBAR); + QEMU_CAPS_PCI_ROMBAR, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -570,7 +583,8 @@ mymain(void) QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_HUB, QEMU_CAPS_NO_SHUTDOWN, - QEMU_CAPS_PCI_ROMBAR); + QEMU_CAPS_PCI_ROMBAR, + QEMU_CAPS_NO_ACPI); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -632,7 +646,8 @@ mymain(void) QEMU_CAPS_USB_HUB, QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_PCI_ROMBAR, - QEMU_CAPS_ICH9_AHCI); + QEMU_CAPS_ICH9_AHCI, + QEMU_CAPS_NO_ACPI); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } |