]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: avoid deadlock on domain object enter monitor fail
authorWang King <king.wang@huawei.com>
Wed, 19 Jul 2017 06:40:24 +0000 (14:40 +0800)
committerJiri Denemark <jdenemar@redhat.com>
Wed, 19 Jul 2017 08:07:21 +0000 (10:07 +0200)
Should be followed with qemuDomainObjExitMonitor only if
qemuDomainObjEnterMonitorAsync returns 0.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
src/qemu/qemu_migration.c
src/qemu/qemu_process.c

index c23fffef2a9cb9bf58e03f62c44eacd879e7ed45..dc562633307eb8187bf244eeb194d2b14ad728a7 100644 (file)
@@ -108,7 +108,7 @@ qemuMigrationCheckTLSCreds(virQEMUDriverPtr driver,
     qemuMonitorMigrationParams migParams = { 0 };
 
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-        goto cleanup;
+        return -1;
 
     if (qemuMonitorGetMigrationParams(priv->mon, &migParams) < 0)
         goto cleanup;
index c2c3e8b71000c673e097d2b95b06bb4b2166c4bb..8d3cfe0c620e5e3952223c29cddd44c619c75502 100644 (file)
@@ -4349,7 +4349,7 @@ qemuProcessSetupBalloon(virQEMUDriverPtr driver,
         return 0;
 
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-        goto cleanup;
+        return -1;
 
     if (vm->def->memballoon->period)
         qemuMonitorSetMemoryStatsPeriod(priv->mon, vm->def->memballoon,