]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: Fix coverity issues after refcount refactoring
authorMartin Kletzander <mkletzan@redhat.com>
Tue, 23 Dec 2014 04:32:45 +0000 (05:32 +0100)
committerMartin Kletzander <mkletzan@redhat.com>
Tue, 23 Dec 2014 04:34:05 +0000 (05:34 +0100)
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
src/qemu/qemu_driver.c
src/qemu/qemu_migration.c

index 673d8a68c4054e024d32df72d9b5a8cd7908eb9e..73a825dfdba4cc1053f59d4768e505c201be2d57 100644 (file)
@@ -1516,7 +1516,8 @@ static virDomainPtr qemuDomainLookupByName(virConnectPtr conn,
     if (dom) dom->id = vm->def->id;
 
  cleanup:
-    virObjectUnlock(vm);
+    if (vm)
+        virObjectUnlock(vm);
     return dom;
 }
 
index 1db6630db78b3e248bdbd049c9fc8b925a1f3505..77e0b357c0696a5370e983cfcfcb48d05914a71b 100644 (file)
@@ -3101,7 +3101,9 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
     VIR_FREE(xmlout);
     VIR_FORCE_CLOSE(dataFD[0]);
     VIR_FORCE_CLOSE(dataFD[1]);
-    if (ret < 0) {
+    if (ret < 0 && priv) {
+        /* priv is set right after vm is added to the list of domains
+         * and there is no 'goto cleanup;' in the middle of those */
         virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
         priv->nbdPort = 0;
         qemuDomainRemoveInactive(driver, vm);