vhost-net: disable mergeable buffers

[mirror_qemu.git] / hw / usb-bus.c

diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index e2d87f2d1f002ad3b4276650a4a444db5bce70d4..ee0e9e30e7f62481f94901e4b457b9c513aa0da3 100644 (file)
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -264,7 +264,8 @@ USBDevice *usbdevice_create(const char *cmdline)
     USBBus *bus = usb_bus_find(-1 /* any */);
     DeviceInfo *info;
     USBDeviceInfo *usb;
-    char driver[32], *params;
+    char driver[32];
+    const char *params;
     int len;
 
     params = strchr(cmdline,':');
@@ -275,6 +276,7 @@ USBDevice *usbdevice_create(const char *cmdline)
             len = sizeof(driver);
         pstrcpy(driver, len, cmdline);
     } else {
+        params = "";
         pstrcpy(driver, sizeof(driver), cmdline);
     }
 
@@ -297,7 +299,7 @@ USBDevice *usbdevice_create(const char *cmdline)
     }
 
     if (!usb->usbdevice_init) {
-        if (params) {
+        if (*params) {
             error_report("usbdevice %s accepts no params", driver);
             return NULL;
         }