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
This commit is contained in:
Daniel P. Berrange 2010-03-02 17:16:30 +00:00
parent a8464c516b
commit 44f687297a

View File

@ -2123,9 +2123,11 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon,
goto cleanup; 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, qemuReportError(VIR_ERR_OPERATION_FAILED,
_("adding %s device failed: %s"), devicestr, reply); _("adding %s device failed"), devicestr);
goto cleanup; goto cleanup;
} }