qemuDomainRemoveInactiveLocked: Remove 'driver' argument

The function can extract the value from @vm's private data.

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 8ad7a57a8577201ad322e0b1d0e893b76b8f8781..90258e960370b1131b65314d8b232ff3dc659168 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5849,8 +5849,7 @@ qemuDomainRemoveInactive(virQEMUDriver *driver,
  * from locked list method.
  */
 void
-qemuDomainRemoveInactiveLocked(virQEMUDriver *driver,
-                               virDomainObj *vm)
+qemuDomainRemoveInactiveLocked(virDomainObj *vm)
 {
     if (vm->persistent) {
         /* Short-circuit, we don't want to remove a persistent domain */
@@ -5859,7 +5858,7 @@ qemuDomainRemoveInactiveLocked(virQEMUDriver *driver,
 
     qemuDomainRemoveInactiveCommon(vm, 0, false);
 
-    virDomainObjListRemoveLocked(driver->domains, vm);
+    virDomainObjListRemoveLocked(QEMU_DOMAIN_PRIVATE(vm)->driver->domains, vm);
 }
 
 void

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 8c1993ec6443712cb3f3d32fdf3b48346e0f5cf4..56683848aa99ad7a88d2ad27a0b8a5b9f28df41c 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -697,8 +697,7 @@ void qemuDomainRemoveInactive(virQEMUDriver *driver,
                               bool migration);
 
 void
-qemuDomainRemoveInactiveLocked(virQEMUDriver *driver,
-                               virDomainObj *vm);
+qemuDomainRemoveInactiveLocked(virDomainObj *vm);
 
 void qemuDomainSetFakeReboot(virDomainObj *vm,
                              bool value);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 5132656bd6b22fcbca21bcd2167b077c75f177cb..59a7eb524dce6052576f86e370b7326658df9b07 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -9871,7 +9871,7 @@ qemuProcessReconnectHelper(virDomainObj *obj,
          */
         qemuProcessStop(obj, VIR_DOMAIN_SHUTOFF_FAILED,
                         VIR_ASYNC_JOB_NONE, 0);
-        qemuDomainRemoveInactiveLocked(src->driver, obj);
+        qemuDomainRemoveInactiveLocked(obj);
 
         virDomainObjEndAPI(&obj);
         g_clear_object(&data->identity);