From c4dae2d9a8a317b2485b6e1a242b77654bedee81 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Thu, 24 Mar 2011 16:56:40 +0800 Subject: [PATCH] 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 --- src/qemu/qemu_monitor_text.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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, -- GitLab