From 88fab9d6fe37abb85c3c4b51c046b49e1601b5da Mon Sep 17 00:00:00 2001 Message-ID: <88fab9d6fe37abb85c3c4b51c046b49e1601b5da.1738940191.git.jdenemar@redhat.com> From: Peter Krempa Date: Mon, 27 Jan 2025 13:42:36 +0100 Subject: [PATCH] qemu: Rename 'diskAlias' to 'device' in qemu IO error event handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The field is named 'device' in the event so unify our naming. Signed-off-by: Peter Krempa Reviewed-by: Daniel P. Berrangé (cherry picked from commit 2d6bd6f05fc57839093850ebfc06c9b4e02b4f67) https://issues.redhat.com/browse/RHEL-77884 --- src/qemu/qemu_monitor.c | 4 ++-- src/qemu/qemu_monitor.h | 4 ++-- src/qemu/qemu_process.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 79bd91b539..e98da5fbff 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1127,7 +1127,7 @@ qemuMonitorEmitWatchdog(qemuMonitor *mon, int action) void qemuMonitorEmitIOError(qemuMonitor *mon, - const char *diskAlias, + const char *device, const char *nodename, int action, const char *reason) @@ -1135,7 +1135,7 @@ qemuMonitorEmitIOError(qemuMonitor *mon, VIR_DEBUG("mon=%p", mon); QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm, - diskAlias, nodename, action, reason); + device, nodename, action, reason); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 89a59dfd27..0ab60f286d 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -206,7 +206,7 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, int action); typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, virDomainObj *vm, - const char *diskAlias, + const char *device, const char *nodename, int action, const char *reason); @@ -450,7 +450,7 @@ void qemuMonitorEmitResume(qemuMonitor *mon); void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset); void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action); void qemuMonitorEmitIOError(qemuMonitor *mon, - const char *diskAlias, + const char *device, const char *nodename, int action, const char *reason); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b4f6d358f3..3861d91228 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -824,7 +824,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED, static void qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, - const char *diskAlias, + const char *device, const char *nodename, int action, const char *reason) @@ -840,8 +840,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virObjectLock(vm); priv = QEMU_DOMAIN_PRIVATE(vm); - if (diskAlias) - disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL); + if (device) + disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, NULL); else if (nodename) disk = qemuDomainDiskLookupByNodename(vm->def, NULL, nodename, NULL); else -- 2.48.1