[libvirt] [libvirt PATCH v2 28/44] Deprecate QEMU_CAPS_NO_SHUTDOWN

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 4 +--- src/qemu/qemu_driver.c | 8 +------- src/qemu/qemu_process.c | 15 ++++----------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 1 + tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 + [ ... ] tests/qemuxml2argvdata/watchdog-injectnmi.args | 1 + tests/qemuxml2argvdata/watchdog.args | 1 + tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 + tests/qemuxml2argvtest.c | 2 +- 635 files changed, 612 insertions(+), 49 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e1c155c42b..ffecb35132 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3630,7 +3630,6 @@ static qemuMonitorCallbacks callbacks = { static void virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV_READONLY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_COPY_ON_READ); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 8c83f81704..c814227c21 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -150,7 +150,7 @@ typedef enum { QEMU_CAPS_PCI_OHCI, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR, /* -device usb-redir */ QEMU_CAPS_USB_HUB, /* -device usb-hub */ - QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */ + X_QEMU_CAPS_NO_SHUTDOWN, /* usable -no-shutdown */ /* 75 */ QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3bb285aed4..157898ee2b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6223,10 +6223,8 @@ qemuBuildPMCommandLine(virCommandPtr cmd, * when QEMU stops. If we use no-shutdown, then we can * watch for this event and do a soft/warm reboot. */ - if (priv->monJSON && priv->allowReboot == VIR_TRISTATE_BOOL_YES && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { + if (priv->monJSON && priv->allowReboot == VIR_TRISTATE_BOOL_YES) virCommandAddArg(cmd, "-no-shutdown"); - } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_ACPI)) { if (def->features[VIR_DOMAIN_FEATURE_ACPI] != VIR_TRISTATE_SWITCH_ON) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fd08817469..e3600d99de 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2122,13 +2122,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) */ if ((!useAgent) || (ret < 0 && (acpiRequested || !flags))) { -#if WITH_YAJL - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("ACPI reboot is not supported with this QEMU binary")); - goto endjob; - } -#else +#if !WITH_YAJL virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("ACPI reboot is not supported without the JSON monitor")); goto endjob; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c6cfd05216..d175b196ea 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7486,17 +7486,10 @@ qemuProcessReconnect(void *opaque) /* We can't get the monitor back, so must kill the VM * to remove danger of it ending up running twice if * user tries to start it again later - */ - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { - /* If we couldn't get the monitor and qemu supports - * no-shutdown, we can safely say that the domain - * crashed ... */ - state = VIR_DOMAIN_SHUTOFF_CRASHED; - } else { - /* ... but if it doesn't we can't say what the state - * really is and FAILED means "failed to start" */ - state = VIR_DOMAIN_SHUTOFF_UNKNOWN; - } + * If we couldn't get the monitor and qemu supports + * no-shutdown, we can safely say that the domain + * crashed ... */ + state = VIR_DOMAIN_SHUTOFF_CRASHED; /* If BeginJob failed, we jumped here without a job, let's hope another * thread didn't have a chance to start playing with the domain yet * (it's all we can do anyway). diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 3ace4ee1d3..fedb71b094 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 4203337c2d..85834e7136 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 95c6b154f2..fe17eef72d 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index df9b610178..3a4c5e5b2f 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index add05c16b4..66bfb686bf 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index c492c82271..b4f701985b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 7a44357988..bfbb413dc5 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index d72d739043..bbaa580d91 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index ab543b8e49..51bf5af1b0 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 619728b819..68833a8be9 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index c0c9282ead..b1592d82c6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 7bf617ce55..1358ed24ef 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index f6773b3eae..bc809d4c8b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -24,7 +24,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 6b999c093f..d61ca6687c 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 7e6599c7f0..4c8a97d19c 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index f2ac19fb5e..8a6cbb75b1 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -19,7 +19,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 6889127119..c20d5cfe55 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 4e0fa0d04c..49f90ff1d1 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index be75c82a6c..c3c10799e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 50f40e7739..ce10968e40 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index e0c7cce095..ec497f50e1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 22936542e7..aaafb63506 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index ad4215401b..957e34178f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='vt82c686b-usb-uhci'/> <flag name='pci-ohci'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='fsdev-readonly'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 2877774baf..a40122a50f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.ioeventfd'/> <flag name='virtio-blk-pci.event_idx'/> <flag name='virtio-net-pci.event_idx'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='fsdev-readonly'/> <flag name='virtio-blk-pci.scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index b47dc22ebd..66d5a25848 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='pci-ohci'/> <flag name='usb-redir'/> <flag name='usb-hub'/> - <flag name='no-shutdown'/> <flag name='cache-unsafe'/> <flag name='ich9-ahci'/> <flag name='no-acpi'/> diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 4d2dbf8724..6f332941ce 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -19,6 +19,7 @@ QEMU_AUDIO_DRV=none \ path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=control \ -rtc base=utc \ +-no-shutdown \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ [ ... etc ... ] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d451626be5..07f7630655 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1681,7 +1681,7 @@ mymain(void) QEMU_CAPS_SCSI_LSI); DO_TEST("monitor-json", NONE); - DO_TEST("no-shutdown", QEMU_CAPS_NO_SHUTDOWN); + DO_TEST("no-shutdown", NONE); DO_TEST("seclabel-dynamic", NONE); DO_TEST("seclabel-dynamic-baselabel", NONE); -- 2.16.1