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_backup.c | 2 +- src/qemu/qemu_domainjob.c | 6 +++--- src/qemu/qemu_domainjob.h | 3 +-- src/qemu/qemu_migration.c | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index c3566bcd57..44514d08fc 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -619,7 +619,7 @@ qemuBackupJobTerminate(virDomainObj *vm, vm->job->completed->status = jobstatus; vm->job->completed->errmsg = g_strdup(priv->backup->errmsg); - qemuDomainEventEmitJobCompleted(priv->driver, vm); + qemuDomainEventEmitJobCompleted(vm); } g_clear_pointer(&priv->backup, virDomainBackupDefFree); diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index afea1ea57a..e5236c9778 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -95,9 +95,9 @@ qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, void -qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, - virDomainObj *vm) +qemuDomainEventEmitJobCompleted(virDomainObj *vm) { + qemuDomainObjPrivate *priv = vm->privateData; virObjectEvent *event; virTypedParameterPtr params = NULL; int nparams = 0; @@ -113,7 +113,7 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, } event = virDomainEventJobCompletedNewFromObj(vm, params, nparams); - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(priv->driver->domainEventState, event); } diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index c3de401aa5..bd6731abb5 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -66,8 +66,7 @@ const char *qemuDomainAsyncJobPhaseToString(virDomainAsyncJob job, int qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, const char *phase); -void qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, - virDomainObj *vm); +void qemuDomainEventEmitJobCompleted(virDomainObj *vm); void qemuDomainObjAbortAsyncJob(virDomainObj *obj); void qemuDomainObjSetJobPhase(virDomainObj *obj, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 32afc788ad..b2d67a1e74 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4122,7 +4122,7 @@ qemuMigrationSrcComplete(virQEMUDriver *driver, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_MIGRATED); virObjectEventStateQueue(driver->domainEventState, event); - qemuDomainEventEmitJobCompleted(driver, vm); + qemuDomainEventEmitJobCompleted(vm); priv->preMigrationMemlock = 0; } @@ -7313,7 +7313,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, if (compressor && virCommandWait(compressor, NULL) < 0) goto cleanup; - qemuDomainEventEmitJobCompleted(driver, vm); + qemuDomainEventEmitJobCompleted(vm); ret = 0; cleanup: -- 2.52.0