From 2edd047dcd0b7544ea6f49248686c22e1b6cb868 Mon Sep 17 00:00:00 2001 Message-ID: <2edd047dcd0b7544ea6f49248686c22e1b6cb868.1738937224.git.jdenemar@redhat.com> From: Peter Krempa Date: Fri, 24 Jan 2025 17:16:35 +0100 Subject: [PATCH] qemuProcessHandleIOError: Refactor to extract 'priv' instead of 'driver' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The VM private data will be used in a sub-sequent patch. To minimize churn, refactor the function before changing the logic. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrangé (cherry picked from commit 72142dcde34dd7e1dfb3ea0d841f567badd80539) https://issues.redhat.com/browse/RHEL-76802 --- src/qemu/qemu_process.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7297263d33..c618fbf69c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -829,7 +829,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, int action, const char *reason) { - virQEMUDriver *driver; + qemuDomainObjPrivate *priv; virObjectEvent *ioErrorEvent = NULL; virObjectEvent *ioErrorEvent2 = NULL; virObjectEvent *lifecycleEvent = NULL; @@ -838,7 +838,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virDomainDiskDef *disk; virObjectLock(vm); - driver = QEMU_DOMAIN_PRIVATE(vm)->driver; + priv = QEMU_DOMAIN_PRIVATE(vm); if (*diskAlias == '\0') diskAlias = NULL; @@ -863,7 +863,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, if (action == VIR_DOMAIN_EVENT_IO_ERROR_PAUSE && virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { - qemuDomainObjPrivate *priv = vm->privateData; VIR_WARN("Transitioned guest %s to paused state due to IO error", vm->def->name); if (priv->signalIOError) @@ -875,7 +874,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, VIR_DOMAIN_EVENT_SUSPENDED_IOERROR); VIR_FREE(priv->lockState); - if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + if (virDomainLockProcessPause(priv->driver->lockManager, vm, &priv->lockState) < 0) VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); @@ -883,9 +882,9 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, } virObjectUnlock(vm); - virObjectEventStateQueue(driver->domainEventState, ioErrorEvent); - virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2); - virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); + virObjectEventStateQueue(priv->driver->domainEventState, ioErrorEvent); + virObjectEventStateQueue(priv->driver->domainEventState, ioErrorEvent2); + virObjectEventStateQueue(priv->driver->domainEventState, lifecycleEvent); } -- 2.48.1