External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-06 20:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rename 'diskAlias' to 'device' in qemu IO error event handling

Browse Source 
The field is named 'device' in the event so unify our naming.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Peter Krempa 2025-01-27 13:42:36 +01:00
parent 2f8359f827
commit 2d6bd6f05f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_monitor.c
View File

@ -1127,7 +1127,7 @@ qemuMonitorEmitWatchdog(qemuMonitor *mon, int action)
void void
qemuMonitorEmitIOError(qemuMonitor *mon, qemuMonitorEmitIOError(qemuMonitor *mon,
const char *diskAlias, const char *device,
const char *nodename, const char *nodename,
int action, int action,
const char *reason) const char *reason)
@ -1135,7 +1135,7 @@ qemuMonitorEmitIOError(qemuMonitor *mon,
VIR_DEBUG("mon=%p", mon); VIR_DEBUG("mon=%p", mon);
QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm, QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm,
diskAlias, nodename, action, reason); device, nodename, action, reason);
} }

4
src/qemu/qemu_monitor.h
View File

@ -206,7 +206,7 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
int action); int action);
typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *diskAlias, const char *device,
const char *nodename, const char *nodename,
int action, int action,
const char *reason); const char *reason);
@ -450,7 +450,7 @@ void qemuMonitorEmitResume(qemuMonitor *mon);
void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset); void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset);
void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action); void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action);
void qemuMonitorEmitIOError(qemuMonitor *mon, void qemuMonitorEmitIOError(qemuMonitor *mon,
const char *diskAlias, const char *device,
const char *nodename, const char *nodename,
int action, int action,
const char *reason); const char *reason);

6
src/qemu/qemu_process.c
View File

@ -824,7 +824,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
static void static void
qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *diskAlias, const char *device,
const char *nodename, const char *nodename,
int action, int action,
const char *reason) const char *reason)
@ -840,8 +840,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
virObjectLock(vm); virObjectLock(vm);
priv = QEMU_DOMAIN_PRIVATE(vm); priv = QEMU_DOMAIN_PRIVATE(vm);
if (diskAlias) if (device)
disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL); disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, NULL);
else if (nodename) else if (nodename)
disk = qemuDomainDiskLookupByNodename(vm->def, NULL, nodename, NULL); disk = qemuDomainDiskLookupByNodename(vm->def, NULL, nodename, NULL);
else else