From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NNBNf-0001K3-2e for qemu-devel@nongnu.org; Tue, 22 Dec 2009 15:30:55 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NNBNZ-0001Cq-Vs for qemu-devel@nongnu.org; Tue, 22 Dec 2009 15:30:54 -0500 Received: from [199.232.76.173] (port=37048 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NNBNZ-0001Cj-Qo for qemu-devel@nongnu.org; Tue, 22 Dec 2009 15:30:49 -0500 Received: from mail-yx0-f188.google.com ([209.85.210.188]:44525) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NNBNZ-0002QB-I2 for qemu-devel@nongnu.org; Tue, 22 Dec 2009 15:30:49 -0500 Received: by yxe26 with SMTP id 26so6308154yxe.4 for ; Tue, 22 Dec 2009 12:30:48 -0800 (PST) From: Scott Tsai Date: Wed, 23 Dec 2009 04:30:18 +0800 Message-Id: <1261513818-23626-1-git-send-email-scottt.tw@gmail.com> Subject: [Qemu-devel] [FOR 0.12][PATCH] Improve usbdevice error messages List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Scott Tsai When an non-existent USB device is specified on the command line, print "qemu: could not add USB device 'X'". Likewise for the usb_{add,del} monitor commands. Signed-off-by: Scott Tsai --- vl.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index 8be3648..ee9c3f9 100644 --- a/vl.c +++ b/vl.c @@ -2689,17 +2689,28 @@ static int usb_device_del(const char *devname) static int usb_parse(const char *cmdline) { - return usb_device_add(cmdline, 0); + int r; + r = usb_device_add(cmdline, 0); + if (r < 0) { + fprintf(stderr, "qemu: could not add USB device '%s'\n", cmdline); + } + return r; } void do_usb_add(Monitor *mon, const QDict *qdict) { - usb_device_add(qdict_get_str(qdict, "devname"), 1); + const char *devname = qdict_get_str(qdict, "devname"); + if (usb_device_add(devname, 1) < 0) { + qemu_error("could not add USB device '%s'\n", devname); + } } void do_usb_del(Monitor *mon, const QDict *qdict) { - usb_device_del(qdict_get_str(qdict, "devname")); + const char *devname = qdict_get_str(qdict, "devname"); + if (usb_device_del(devname) < 0) { + qemu_error("could not delete USB device '%s'\n", devname); + } } /***********************************************************/ -- 1.6.5.2