shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

qemuMonitorJSONHandleIOError: Propagate new 'qom-path' field

Browse Source 
QEMU commit v9.1.0-1065-ge67b7aef7c added 'qom-path' as an optional
field for the BLOCK_IO_ERROR event. Extract and propagate it as an
alternative to lookup via 'node-name' and 'device' (alias).

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-28 10:39:52 +01:00
parent 784538a470
commit 0525323175
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_monitor.c
View File

@ -1128,6 +1128,7 @@ qemuMonitorEmitWatchdog(qemuMonitor *mon, int action)
void
qemuMonitorEmitIOError(qemuMonitor *mon,
const char *device,
const char *qompath,
const char *nodename,
int action,
bool nospace,
@ -1136,7 +1137,7 @@ qemuMonitorEmitIOError(qemuMonitor *mon,
VIR_DEBUG("mon=%p", mon);
QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm,
device, nodename, action, nospace, reason);
device, qompath, nodename, action, nospace, reason);
}

2
src/qemu/qemu_monitor.h
View File

@ -207,6 +207,7 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
virDomainObj *vm,
const char *device,
const char *qompath,
const char *nodename,
int action,
bool nospace,
@ -452,6 +453,7 @@ void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset);
void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action);
void qemuMonitorEmitIOError(qemuMonitor *mon,
const char *device,
const char *qompath,
const char *nodename,
int action,
bool nospace,

4
src/qemu/qemu_monitor_json.c
View File

@ -693,6 +693,7 @@ static void
qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
{
const char *device;
const char *qompath;
const char *nodename;
const char *action;
const char *reason;
@ -718,6 +719,7 @@ qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
device = NULL;
}
qompath = virJSONValueObjectGetString(data, "qom-path");
nodename = virJSONValueObjectGetString(data, "node-name");
reason = virJSONValueObjectGetString(data, "reason");
/* 'nospace' flag is relevant only when true */
@ -728,7 +730,7 @@ qemuMonitorJSONHandleIOError(qemuMonitor *mon, virJSONValue *data)
actionID = VIR_DOMAIN_EVENT_IO_ERROR_NONE;
}
qemuMonitorEmitIOError(mon, device, nodename, actionID, nospace, reason);
qemuMonitorEmitIOError(mon, device, qompath, nodename, actionID, nospace, reason);
}

3
src/qemu/qemu_process.c
View File

@ -825,6 +825,7 @@ static void
qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm,
const char *device,
const char *qompath,
const char *nodename,
int action,
bool nospace,
@ -847,7 +848,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
disk = qemuDomainDiskLookupByNodename(vm->def, priv->backup, nodename, &src);
if (!disk)
disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, NULL);
disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, qompath);
if (!src && disk)
src = disk->src;