External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: monitor: Handle BLOCK_IO_ERROR event properly with -blockdev

Browse Source 
Use the 'node-name' provided in the event if 'device' is empty to look
up the disk.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-08-13 17:02:38 +02:00
parent d322a83674
commit adf85f4791
4 changed files with 19 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

@ -1421,6 +1421,7 @@ qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int action)
int int
qemuMonitorEmitIOError(qemuMonitorPtr mon, qemuMonitorEmitIOError(qemuMonitorPtr mon,
const char *diskAlias, const char *diskAlias,
const char *nodename,
int action, int action,
const char *reason) const char *reason)
{ {
@ -1428,7 +1429,7 @@ qemuMonitorEmitIOError(qemuMonitorPtr mon,
VIR_DEBUG("mon=%p", mon); VIR_DEBUG("mon=%p", mon);
QEMU_MONITOR_CALLBACK(mon, ret, domainIOError, mon->vm, QEMU_MONITOR_CALLBACK(mon, ret, domainIOError, mon->vm,
diskAlias, action, reason); diskAlias, nodename, action, reason);
return ret; return ret;
} }

2
src/qemu/qemu_monitor.h
View File

@ -155,6 +155,7 @@ typedef int (*qemuMonitorDomainWatchdogCallback)(qemuMonitorPtr mon,
typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitorPtr mon, typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitorPtr mon,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *diskAlias, const char *diskAlias,
const char *nodename,
int action, int action,
const char *reason, const char *reason,
void *opaque); void *opaque);
@ -383,6 +384,7 @@ int qemuMonitorEmitRTCChange(qemuMonitorPtr mon, long long offset);
int qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int action); int qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int action);
int qemuMonitorEmitIOError(qemuMonitorPtr mon, int qemuMonitorEmitIOError(qemuMonitorPtr mon,
const char *diskAlias, const char *diskAlias,
const char *nodename,
int action, int action,
const char *reason); const char *reason);
int qemuMonitorEmitGraphics(qemuMonitorPtr mon, int qemuMonitorEmitGraphics(qemuMonitorPtr mon,

5
src/qemu/qemu_monitor_json.c
View File

@ -765,6 +765,7 @@ static void
qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data) qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data)
{ {
const char *device; const char *device;
const char *nodename;
const char *action; const char *action;
const char *reason = ""; const char *reason = "";
bool nospc = false; bool nospc = false;
@ -782,6 +783,8 @@ qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data)
if ((device = virJSONValueObjectGetString(data, "device")) == NULL) if ((device = virJSONValueObjectGetString(data, "device")) == NULL)
VIR_WARN("missing device in disk io error event"); VIR_WARN("missing device in disk io error event");
nodename = virJSONValueObjectGetString(data, "node-name");
if (virJSONValueObjectGetBoolean(data, "nospace", &nospc) == 0 && nospc) if (virJSONValueObjectGetBoolean(data, "nospace", &nospc) == 0 && nospc)
reason = "enospc"; reason = "enospc";
@ -790,7 +793,7 @@ qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data)
actionID = VIR_DOMAIN_EVENT_IO_ERROR_NONE; actionID = VIR_DOMAIN_EVENT_IO_ERROR_NONE;
} }
qemuMonitorEmitIOError(mon, device, actionID, reason); qemuMonitorEmitIOError(mon, device, nodename, actionID, reason);
} }

10
src/qemu/qemu_process.c
View File

@ -855,6 +855,7 @@ static int
qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *diskAlias, const char *diskAlias,
const char *nodename,
int action, int action,
const char *reason, const char *reason,
void *opaque) void *opaque)
@ -869,7 +870,16 @@ qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
virObjectLock(vm); virObjectLock(vm);
if (*diskAlias == '\0')
diskAlias = NULL;
if (diskAlias)
disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL); disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL);
else if (nodename)
disk = qemuDomainDiskLookupByNodename(vm->def, nodename, NULL, NULL);
else
disk = NULL;
if (disk) { if (disk) {
srcPath = virDomainDiskGetSource(disk); srcPath = virDomainDiskGetSource(disk);