From d6cf1204db14d2ba76b640268f253d2ea6f0c131 Mon Sep 17 00:00:00 2001 From: Feng Ni Date: Wed, 15 Apr 2020 11:28:41 +0800 Subject: qemu: fix a concurrent operation situation Migrate vm and shutdown in guestos, interface do not return occasionally. In function qemuMigrationSrcNBDStorageCopy, it may be alays in while loop if qemu exits. Signed-off-by: Feng Ni Signed-off-by: Xu Yandong --- src/qemu/qemu_migration.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8a1801d..65b47ec 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1048,6 +1048,11 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, if (rv < 0) return -1; + if (!virDomainObjIsActive(vm)) { + VIR_ERROR(_("domain is no longer running, migrate will end")); + return -1; + } + if (priv->job.abortJob) { priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_CANCELED; virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), -- 2.23.0