From: Peter Krempa <pkrempa@redhat.com> 'driver' is part of domain's private data. Use it directly and adjust all callers recursively. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_driver.c | 10 ++++------ src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_process.c | 15 ++++++--------- src/qemu/qemu_process.h | 3 +-- src/qemu/qemu_saveimage.c | 2 +- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cdd333c882..a81a4054d6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1966,7 +1966,6 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) int ret = -1; qemuDomainObjPrivate *priv; virDomainState state; - virQEMUDriver *driver = dom->conn->privateData; virCheckFlags(0, -1); @@ -2001,7 +2000,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) if (state == VIR_DOMAIN_CRASHED) virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_CRASHED); - qemuProcessRefreshState(driver, vm, VIR_ASYNC_JOB_NONE); + qemuProcessRefreshState(vm, VIR_ASYNC_JOB_NONE); endjob: virDomainObjEndJob(vm); @@ -4035,13 +4034,12 @@ processMemoryDeviceSizeChange(virQEMUDriver *driver, static void -processResetEvent(virQEMUDriver *driver, - virDomainObj *vm) +processResetEvent(virDomainObj *vm) { if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) return; - qemuProcessRefreshState(driver, vm, VIR_ASYNC_JOB_NONE); + qemuProcessRefreshState(vm, VIR_ASYNC_JOB_NONE); virDomainObjEndJob(vm); } @@ -4133,7 +4131,7 @@ static void qemuProcessEventHandler(void *data, void *opaque) processEvent->status); break; case QEMU_PROCESS_EVENT_RESET: - processResetEvent(driver, vm); + processResetEvent(vm); break; case QEMU_PROCESS_EVENT_NBDKIT_EXITED: processNbdkitExitedEvent(vm, processEvent->data); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 88db5e93fa..0e097f25b1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6805,7 +6805,7 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, /* Now that the state data was transferred we can refresh the actual state * of the devices */ - if (qemuProcessRefreshState(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN) < 0) { + if (qemuProcessRefreshState(vm, VIR_ASYNC_JOB_MIGRATION_IN) < 0) { /* Similarly to the case above v2 protocol will not be able to recover * from this. Let's ignore this and perhaps stuff will not break. */ if (v3proto) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0b78d45ef6..2628a89cbf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3225,8 +3225,7 @@ qemuProcessCleanupChardevDevice(virDomainDef *def G_GNUC_UNUSED, * migration. */ static int -qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, - virDomainObj *vm, +qemuProcessUpdateVideoRamSize(virDomainObj *vm, int asyncJob) { int ret = -1; @@ -3296,8 +3295,8 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, qemuDomainObjExitMonitor(vm); - cfg = virQEMUDriverGetConfig(driver); - ret = virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); + cfg = virQEMUDriverGetConfig(priv->driver); + ret = virDomainObjSave(vm, priv->driver->xmlopt, cfg->stateDir); return ret; @@ -8690,7 +8689,6 @@ qemuProcessRefreshDisks(virDomainObj *vm, /** * qemuProcessRefreshState: - * @driver: qemu driver data * @vm: domain to refresh * @asyncJob: async job type * @@ -8699,8 +8697,7 @@ qemuProcessRefreshDisks(virDomainObj *vm, * state influenced by the migration stream. */ int -qemuProcessRefreshState(virQEMUDriver *driver, - virDomainObj *vm, +qemuProcessRefreshState(virDomainObj *vm, virDomainAsyncJob asyncJob) { VIR_DEBUG("Fetching list of active devices"); @@ -8712,7 +8709,7 @@ qemuProcessRefreshState(virQEMUDriver *driver, return -1; VIR_DEBUG("Detecting actual memory size for video device"); - if (qemuProcessUpdateVideoRamSize(driver, vm, asyncJob) < 0) + if (qemuProcessUpdateVideoRamSize(vm, asyncJob) < 0) return -1; VIR_DEBUG("Updating disk data"); @@ -8839,7 +8836,7 @@ qemuProcessStart(virConnectPtr conn, /* Refresh state of devices from QEMU. During migration this happens * in qemuMigrationDstFinish to ensure that state information is fully * transferred. */ - if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) + if (qemuProcessRefreshState(vm, asyncJob) < 0) goto stop; } diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index df63cac9b8..d96502b601 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -163,8 +163,7 @@ int qemuProcessFinishStartup(virQEMUDriver *driver, bool startCPUs, virDomainPausedReason pausedReason); -int qemuProcessRefreshState(virQEMUDriver *driver, - virDomainObj *vm, +int qemuProcessRefreshState(virDomainObj *vm, virDomainAsyncJob asyncJob); typedef enum { diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index cdfa9be09d..23922acd51 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -759,7 +759,7 @@ qemuSaveImageStartVM(virConnectPtr conn, VIR_DOMAIN_EVENT_STARTED_RESTORED); virObjectEventStateQueue(driver->domainEventState, event); - if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) + if (qemuProcessRefreshState(vm, asyncJob) < 0) goto cleanup; /* If it was running before, resume it now unless caller requested pause. */ -- 2.53.0