From 9874c09393d9bff08b98e21e7931f8dcf15e89d6 Mon Sep 17 00:00:00 2001 From: Feng Ni Date: Wed, 15 Apr 2020 11:28:41 +0800 Subject: [PATCH] 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 f9c34b72e8..7ae1cd7051 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1250,6 +1250,11 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, if (rv < 0) return -1; + if (!virDomainObjIsActive(vm)) { + VIR_ERROR(_("domain is no longer running, migrate will end")); + return -1; + } + if (vm->job->abortJob) { vm->job->current->status = VIR_DOMAIN_JOB_STATUS_CANCELED; virReportError(VIR_ERR_OPERATION_ABORTED, _("%1$s: %2$s"), -- 2.27.0