qemuDomainRemoveInactive: Remove 'driver' argument

The function can fetch it from @vm.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 90258e960370b1131b65314d8b232ff3dc659168..a7e41983161b1611c6ee94e0754fbf0a2f4277fc 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5825,8 +5825,7 @@ qemuDomainRemoveInactiveCommon(virDomainObj *vm,
  * The caller must hold a lock to the vm.
  */
 void
-qemuDomainRemoveInactive(virQEMUDriver *driver,
-                         virDomainObj *vm,
+qemuDomainRemoveInactive(virDomainObj *vm,
                          virDomainUndefineFlagsValues flags,
                          bool migration)
 {
@@ -5837,7 +5836,7 @@ qemuDomainRemoveInactive(virQEMUDriver *driver,
 
     qemuDomainRemoveInactiveCommon(vm, flags, migration);
 
-    virDomainObjListRemove(driver->domains, vm);
+    virDomainObjListRemove(QEMU_DOMAIN_PRIVATE(vm)->driver->domains, vm);
 }
 
 

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 56683848aa99ad7a88d2ad27a0b8a5b9f28df41c..ee6074c9f6ba48fe61cda8fc4b8f11053ee01e26 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -691,8 +691,7 @@ int qemuDomainMomentDiscardAll(void *payload,
                                const char *name,
                                void *data);
 
-void qemuDomainRemoveInactive(virQEMUDriver *driver,
-                              virDomainObj *vm,
+void qemuDomainRemoveInactive(virDomainObj *vm,
                               virDomainUndefineFlagsValues flags,
                               bool migration);
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 50a5cdd5944029e5bc8d374a047f3a5589704d22..893fa0c66cb0378616c810cf6bed03e640c8df8b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1577,7 +1577,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
         goto cleanup;
 
     if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, flags) < 0) {
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
         goto cleanup;
     }
 
@@ -1586,7 +1586,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
                          VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
                          start_flags) < 0) {
         virDomainAuditStart(vm, "booted", false);
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
         qemuProcessEndJob(vm);
         goto cleanup;
     }
@@ -2071,7 +2071,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
     ret = 0;
  endjob:
     if (ret == 0)
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
     qemuProcessEndStopJob(vm);
 
  cleanup:
@@ -2707,7 +2707,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver,
     }
     virDomainObjEndAsyncJob(vm);
     if (ret == 0)
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
 
  cleanup:
     virQEMUSaveDataFree(data);
@@ -3243,7 +3243,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom,
 
     virDomainObjEndAsyncJob(vm);
     if (ret == 0 && flags & VIR_DUMP_CRASH)
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
 
  cleanup:
     virDomainObjEndAPI(&vm);
@@ -3563,7 +3563,7 @@ processGuestPanicEvent(virQEMUDriver *driver,
  endjob:
     virDomainObjEndAsyncJob(vm);
     if (removeInactive)
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
 }
 
 
@@ -3891,7 +3891,7 @@ processMonitorEOFEvent(virQEMUDriver *driver,
     virObjectEventStateQueue(driver->domainEventState, event);
 
  endjob:
-    qemuDomainRemoveInactive(driver, vm, 0, migration);
+    qemuDomainRemoveInactive(vm, 0, migration);
     qemuProcessEndStopJob(vm);
 }
 
@@ -5853,7 +5853,7 @@ qemuDomainRestoreInternal(virConnectPtr conn,
     virFileWrapperFdFree(wrapperFd);
     virQEMUSaveDataFree(data);
     if (vm && ret < 0)
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
     virDomainObjEndAPI(&vm);
     return ret;
 }
@@ -6505,7 +6505,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn,
         } else {
             /* Brand new domain. Remove it */
             VIR_INFO("Deleting domain '%s'", vm->def->name);
-            qemuDomainRemoveInactive(driver, vm, 0, false);
+            qemuDomainRemoveInactive(vm, 0, false);
         }
     }
 
@@ -6648,7 +6648,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
      */
     vm->persistent = 0;
     if (!virDomainObjIsActive(vm))
-        qemuDomainRemoveInactive(driver, vm, flags, false);
+        qemuDomainRemoveInactive(vm, flags, false);
 
     ret = 0;
  endjob:

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index f38733f904013ad238296d090309c712da41fdb9..2a01ca58bd495f812c9d5e75fe7a4351b7a79aa8 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3609,7 +3609,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
          * and there is no 'goto cleanup;' in the middle of those */
         VIR_FREE(priv->origname);
         virDomainObjRemoveTransientDef(vm);
-        qemuDomainRemoveInactive(driver, vm, 0, true);
+        qemuDomainRemoveInactive(vm, 0, true);
     }
     virDomainObjEndAPI(&vm);
     virErrorRestore(&origErr);
@@ -4256,7 +4256,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver,
             virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm);
             vm->persistent = 0;
         }
-        qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM, true);
+        qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true);
     }
 
  cleanup:
@@ -6335,7 +6335,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
             virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm);
             vm->persistent = 0;
         }
-        qemuDomainRemoveInactive(driver, vm, 0, true);
+        qemuDomainRemoveInactive(vm, 0, true);
     }
 
     virErrorRestore(&orig_err);
@@ -6420,7 +6420,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
     }
 
     if (!virDomainObjIsActive(vm))
-        qemuDomainRemoveInactive(driver, vm, 0, true);
+        qemuDomainRemoveInactive(vm, 0, true);
 
     return ret;
 }
@@ -6977,7 +6977,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
     }
 
     if (!qemuDomainObjIsActive(vm))
-        qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM, true);
+        qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true);
 
     virErrorRestore(&orig_err);
     return NULL;
@@ -7113,7 +7113,7 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver,
     qemuMigrationJobFinish(vm);
 
     if (!virDomainObjIsActive(vm))
-        qemuDomainRemoveInactive(driver, vm, 0, true);
+        qemuDomainRemoveInactive(vm, 0, true);
 }
 
 

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4800ba154a0fe4c66dbea8e5e83634612896d2cc..04e5c005a0181a3069598574d306224708ea585e 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -9273,7 +9273,7 @@ qemuProcessAutoDestroy(virDomainObj *dom,
                                      VIR_DOMAIN_EVENT_STOPPED,
                                      VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
 
-    qemuDomainRemoveInactive(driver, dom, 0, !!(stopFlags & VIR_QEMU_PROCESS_STOP_MIGRATED));
+    qemuDomainRemoveInactive(dom, 0, !!(stopFlags & VIR_QEMU_PROCESS_STOP_MIGRATED));
 
     qemuProcessEndStopJob(dom);
 
@@ -9795,7 +9795,7 @@ qemuProcessReconnect(void *opaque)
     if (jobStarted)
         virDomainObjEndJob(obj);
     if (!virDomainObjIsActive(obj))
-        qemuDomainRemoveInactive(driver, obj, 0, false);
+        qemuDomainRemoveInactive(obj, 0, false);
     virDomainObjEndAPI(&obj);
     virIdentitySetCurrent(NULL);
     return;

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index a17b9763819d4114820237322032fb5ffdc24aad..8128154749f519292fde01e2aa9b9e212d271689 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -2698,7 +2698,7 @@ qemuSnapshotRevertActive(virDomainObj *vm,
 
  error:
     if (!virDomainObjIsActive(vm))
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
 
     return -1;
 }
@@ -2823,7 +2823,7 @@ qemuSnapshotRevertInactive(virDomainObj *vm,
 
  error:
     if (!virDomainObjIsActive(vm))
-        qemuDomainRemoveInactive(driver, vm, 0, false);
+        qemuDomainRemoveInactive(vm, 0, false);
 
     return -1;
 }