Skip to contentSkip to conversation

Improve usbdevice error messages

PATCH New Scott Tsai 1 participant 1 message Dec 22, 2009

lore
Share & tools
lore

Scott Tsai

author
#0 lore raw

PATCH 1/1 Improve usbdevice error messages

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.

---
 vl.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
vl.c +14 -3
index 8be3648..ee9c3f9 100644
@@ -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);
+    }
 }
 
 /***********************************************************/
Signature · 1 line
1.6.5.2