qemuHotplugAttachDBusVMState: Remove 'driver' argument

We pass in 'vm' which contains it in the private data.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index fb426deb1a2244de6655609bc349f0197ee9f6de..fccbef5d0c630cda1aa2f07a91343b253bb2f0a5 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -330,7 +330,6 @@ qemuHotplugWaitForTrayEject(virDomainObj *vm,
 
 /**
  * qemuHotplugAttachDBusVMState:
- * @driver: QEMU driver object
  * @vm: domain object
  * @asyncJob: asynchronous job identifier
  *
@@ -339,8 +338,7 @@ qemuHotplugWaitForTrayEject(virDomainObj *vm,
  * Returns: 0 on success, -1 on error.
  */
 int
-qemuHotplugAttachDBusVMState(virQEMUDriver *driver,
-                             virDomainObj *vm,
+qemuHotplugAttachDBusVMState(virDomainObj *vm,
                              virDomainAsyncJob asyncJob)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
@@ -355,7 +353,7 @@ qemuHotplugAttachDBusVMState(virQEMUDriver *driver,
         return 0;
     }
 
-    if (!(props = qemuBuildDBusVMStateInfoProps(driver, vm)))
+    if (!(props = qemuBuildDBusVMStateInfoProps(priv->driver, vm)))
         return -1;
 
     if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0)

diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index fb0b5b6cd7fe53c9779666035154a79038bd457c..e6c90253e416fdc2b92b6558145528e409e3fcda 100644 (file)
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -120,8 +120,7 @@ unsigned long long
 qemuDomainGetUnplugTimeout(virDomainObj *vm) ATTRIBUTE_MOCKABLE;
 
 int
-qemuHotplugAttachDBusVMState(virQEMUDriver *driver,
-                             virDomainObj *vm,
+qemuHotplugAttachDBusVMState(virDomainObj *vm,
                              virDomainAsyncJob asyncJob);
 
 int

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 08f05ff7275d642ab1230d538d9893038433c72f..87b2135b5776c16129db3b6da9e1789ec0c52ec5 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4605,15 +4605,14 @@ qemuMigrationSrcContinue(virDomainObj *vm,
 
 
 static int
-qemuMigrationSetDBusVMState(virQEMUDriver *driver,
-                            virDomainObj *vm)
+qemuMigrationSetDBusVMState(virDomainObj *vm)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
 
     if (priv->dbusVMStateIds) {
         int rv;
 
-        if (qemuHotplugAttachDBusVMState(driver, vm, VIR_ASYNC_JOB_NONE) < 0)
+        if (qemuHotplugAttachDBusVMState(vm, VIR_ASYNC_JOB_NONE) < 0)
             return -1;
 
         if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_NONE) < 0)
@@ -5100,7 +5099,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
         }
     }
 
-    if (qemuMigrationSetDBusVMState(driver, vm) < 0)
+    if (qemuMigrationSetDBusVMState(vm) < 0)
         goto error;
 
     /* Before EnterMonitor, since already qemuProcessStopCPUs does that */
@@ -7271,7 +7270,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
     unsigned long saveMigBandwidth = priv->migMaxBandwidth;
     virErrorPtr orig_err = NULL;
 
-    if (qemuMigrationSetDBusVMState(driver, vm) < 0)
+    if (qemuMigrationSetDBusVMState(vm) < 0)
         return -1;
 
     /* Increase migration bandwidth to unlimited since target is a file.