From: Wen Congyang <wency@cn.fujitsu.com>
Date: Thu, 24 Mar 2011 08:56:40 +0000 (+0800)
Subject: fix the check of the output of monitor command 'device_add'
X-Git-Tag: v0.9.0~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4dae2d9a8a317b2485b6e1a242b77654bedee81;p=thirdparty%2Flibvirt.git

fix the check of the output of monitor command 'device_add'

Hotpluging host usb device by text mode will fail, because the monitor
command 'device_add' outputs 'husb: using...' if it succeeds, but we
think the command should not output anything.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 91ecc8b0bd..75b299562e 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -2283,7 +2283,15 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon,
         goto cleanup;
     }
 
-    /* If the command succeeds, no output is sent. So
+    /* If the host device is hotpluged first time, qemu will output
+     * husb: using %s file-system with %s if the command succeeds.
+     */
+    if (STRPREFIX(reply, "husb: using")) {
+        ret = 0;
+        goto cleanup;
+    }
+
+    /* Otherwise, if the command succeeds, no output is sent. So
      * any non-empty string shows an error */
     if (STRNEQ(reply, "")) {
         qemuReportError(VIR_ERR_OPERATION_FAILED,