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

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 ... */

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);