26e17db3c8
- build: Bump minimum glib2 version to 2.66.0 (RHEL-77884) - qemuProcessHandleIOError: Refactor to extract 'priv' instead of 'driver' (RHEL-77884) - qemu: Handle quirks of 'device' field of BLOCK_IO_ERROR event in monitor code (RHEL-77884) - qemu: Rename 'diskAlias' to 'device' in qemu IO error event handling (RHEL-77884) - qemuProcessHandleIOError: Rename local variables (RHEL-77884) - qemuMonitorJSONHandleIOError: Do not munge 'reason' field of IO error event (RHEL-77884) - qemuProcessHandleIOError: Prefer lookup by node name (RHEL-77884) - qemuMonitorJSONHandleIOError: Propagate new 'qom-path' field (RHEL-77884) - virStorageSource: Add fields for storing last I/O error message (RHEL-77884) - qemuProcessHandleIOError: Populate I/O error reason to virStorageSource (RHEL-77884) - qemuProcessHandleIOError: Log IO errors in the VM log file (RHEL-77884) - libxlDomainGetMessages: Add existing flags to 'virCheckFlags' (RHEL-77884) - virDomainObjGetMessages: Refactor using GPtrArray (RHEL-77884) - virDomainGetMessages: Introduce VIR_DOMAIN_MESSAGE_IOERRORS (RHEL-77884) - include: libvirt-domain: Reword documentation for @reason of VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON (RHEL-77884) - include: libvirt-domain: Add 'message' @reason of VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON (RHEL-77884) - qemuSnapshotForEachQcow2: Don't initialize 'nrollback' (RHEL-73315) - qemu: process: Export qemuPrepareNVRAM for use in snapshot code (RHEL-73315) - qemu: snapshot: Ensure that NVRAM image exists when taking inactive internal snapshot (RHEL-73315) - qemuxmlconftest: Allow testing of the 'writable' flag for passed FDs for disks (RHEL-37519) - qemuxmlconftest: Add testing of FDs with 'writable' flag in 'disk-source-fd' (RHEL-37519) - qemu: domain: Initialize FD passthrough for a virStorageSource before using it (RHEL-37519) Resolves: RHEL-37519, RHEL-73315, RHEL-77884
77 lines
3.1 KiB
Diff
77 lines
3.1 KiB
Diff
From 8ae4a9c8e3f66dd7a94cfa4f12614c7ba3e3b1c3 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <8ae4a9c8e3f66dd7a94cfa4f12614c7ba3e3b1c3.1738940190.git.jdenemar@redhat.com>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
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 <pkrempa@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
(cherry picked from commit 72142dcde34dd7e1dfb3ea0d841f567badd80539)
|
|
|
|
https://issues.redhat.com/browse/RHEL-77884
|
|
---
|
|
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
|