Fix check for errors in device_add command in QEMU text monitor

Any output at all from device_add indicates an error in the
command execution. Thus it needs to check for reply != ""

* src/qemu/qemu_monitor_text.c: Fix reply check for errors
  to treat any output as an error
This commit is contained in:
Daniel P. Berrange 2010-05-28 12:18:09 +01:00
parent 345ff369e5
commit c833efd35b

View File

@ -2319,11 +2319,11 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon,
goto cleanup;
}
/* If the command failed qemu prints:
* Could not add ... */
if (strstr(reply, "Could not add ")) {
/* If the command succeeds, no output is sent. So
* any non-empty string shows an error */
if (STRNEQ(reply, "")) {
qemuReportError(VIR_ERR_OPERATION_FAILED,
_("adding %s device failed"), devicestr);
_("adding %s device failed: %s"), devicestr, reply);
goto cleanup;
}