From: Peter Krempa <pkrempa@redhat.com> We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_hotplug.c | 6 ++---- src/qemu/qemu_hotplug.h | 3 +-- src/qemu/qemu_migration.c | 9 ++++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fb426deb1a..fccbef5d0c 100644 --- 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 fb0b5b6cd7..e6c90253e4 100644 --- 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 1371742529..a64a98046a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4602,15 +4602,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) @@ -5097,7 +5096,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, } } - if (qemuMigrationSetDBusVMState(driver, vm) < 0) + if (qemuMigrationSetDBusVMState(vm) < 0) goto error; /* Before EnterMonitor, since already qemuProcessStopCPUs does that */ @@ -7268,7 +7267,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. -- 2.52.0