Re: [libvirt] [PATCH] Fix detection of errors in QEMU device_add command

The code assumed that 'device_add' returned an empty string upon success. This is not true, it sometimes prints random debug info. THus we need to check for an explicit fail string * src/qemu/qemu_monitor_text.c: Fix error checking of the device_add monitor command --- src/qemu/qemu_monitor_text.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 7604ae8..c60e840 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -2122,9 +2122,11 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon, goto cleanup; } - if (STRNEQ(reply, "")) { + /* If the command failed qemu prints: + * Could not add ... */ + if (strstr(reply, "Could not add ")) { qemuReportError(VIR_ERR_OPERATION_FAILED, - _("adding %s device failed: %s"), devicestr, reply); + _("adding %s device failed"), devicestr); goto cleanup; }