Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-06-11-v3' into staging

[qemu.git] / hw / usb / bus.c

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index c28ccb8a9677fcfdabd1ee4298dd1462e184a16e..a28e9e3b33594b3654987859ed4b4fdf6f629baf 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -4,6 +4,7 @@
 #include "hw/qdev.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/qdev.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

+#include "qemu/module.h"

 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "trace.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "trace.h"


@@ -59,12 +60,6 @@ static int usb_device_post_load(void *opaque, int version_id)
     } else {
         dev->attached = true;
     }
     } else {
         dev->attached = true;
     }

-    if (dev->setup_index < 0 ||
-        dev->setup_len < 0 ||
-        dev->setup_index > dev->setup_len ||
-        dev->setup_len > sizeof(dev->data_buf)) {
-        return -EINVAL;
-    }

     return 0;
 }
 
     return 0;
 }
 


@@ -135,11 +130,12 @@ USBDevice *usb_device_find_device(USBDevice *dev, uint8_t addr)
     return NULL;
 }
 
     return NULL;
 }
 

-static void usb_device_handle_destroy(USBDevice *dev)
+static void usb_device_unrealize(USBDevice *dev, Error **errp)

 {
     USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev);
 {
     USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev);

-    if (klass->handle_destroy) {
-        klass->handle_destroy(dev);
+
+    if (klass->unrealize) {
+        klass->unrealize(dev, errp);

     }
 }
 
     }
 }
 


@@ -279,11 +275,18 @@ static void usb_qdev_realize(DeviceState *qdev, Error **errp)
 static void usb_qdev_unrealize(DeviceState *qdev, Error **errp)
 {
     USBDevice *dev = USB_DEVICE(qdev);
 static void usb_qdev_unrealize(DeviceState *qdev, Error **errp)
 {
     USBDevice *dev = USB_DEVICE(qdev);

+    USBDescString *s, *next;
+
+    QLIST_FOREACH_SAFE(s, &dev->strings, next, next) {
+        QLIST_REMOVE(s, next);
+        g_free(s->str);
+        g_free(s);
+    }

 
     if (dev->attached) {
         usb_device_detach(dev);
     }
 
     if (dev->attached) {
         usb_device_detach(dev);
     }

-    usb_device_handle_destroy(dev);
+    usb_device_unrealize(dev, errp);

     if (dev->port) {
         usb_release_port(dev);
     }
     if (dev->port) {
         usb_release_port(dev);
     }


@@ -332,10 +335,9 @@ static USBDevice *usb_try_create_simple(USBBus *bus, const char *name,
     }
     object_property_set_bool(OBJECT(dev), true, "realized", &err);
     if (err) {
     }
     object_property_set_bool(OBJECT(dev), true, "realized", &err);
     if (err) {

-        error_propagate(errp, err);
-        error_prepend(errp, "Failed to initialize USB device '%s': ",
-                      name);
-        object_unparent(OBJECT(dev));
+        error_propagate_prepend(errp, err,
+                                "Failed to initialize USB device '%s': ",
+                                name);

         return NULL;
     }
     return dev;
         return NULL;
     }
     return dev;


@@ -399,8 +401,10 @@ void usb_register_companion(const char *masterbus, USBPort *ports[],
 void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr)
 {
     if (upstream) {
 void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr)
 {
     if (upstream) {

-        snprintf(downstream->path, sizeof(downstream->path), "%s.%d",
-                 upstream->path, portnr);
+        int l = snprintf(downstream->path, sizeof(downstream->path), "%s.%d",
+                         upstream->path, portnr);
+        /* Max string is nn.nn.nn.nn.nn, which fits in 16 bytes */
+        assert(l < sizeof(downstream->path));

         downstream->hubcount = upstream->hubcount + 1;
     } else {
         snprintf(downstream->path, sizeof(downstream->path), "%d", portnr);
         downstream->hubcount = upstream->hubcount + 1;
     } else {
         snprintf(downstream->path, sizeof(downstream->path), "%d", portnr);


@@ -497,6 +501,10 @@ static void usb_mask_to_str(char *dest, size_t size,
                             speeds[i].name);
         }
     }
                             speeds[i].name);
         }
     }

+
+    if (pos == 0) {
+        snprintf(dest, size, "unknown");
+    }

 }
 
 void usb_check_attach(USBDevice *dev, Error **errp)
 }
 
 void usb_check_attach(USBDevice *dev, Error **errp)


@@ -551,28 +559,6 @@ int usb_device_detach(USBDevice *dev)
     return 0;
 }
 
     return 0;
 }
 

-int usb_device_delete_addr(int busnr, int addr)
-{
-    USBBus *bus;
-    USBPort *port;
-    USBDevice *dev;
-
-    bus = usb_bus_find(busnr);
-    if (!bus)
-        return -1;
-
-    QTAILQ_FOREACH(port, &bus->used, next) {
-        if (port->dev->addr == addr)
-            break;
-    }
-    if (!port)
-        return -1;
-    dev = port->dev;
-
-    object_unparent(OBJECT(dev));
-    return 0;
-}
-

 static const char *usb_speed(unsigned int speed)
 {
     static const char *txt[] = {
 static const char *usb_speed(unsigned int speed)
 {
     static const char *txt[] = {


@@ -754,9 +740,7 @@ static void usb_set_attached(Object *obj, bool value, Error **errp)
 
     if (value) {
         usb_device_attach(dev, &err);
 
     if (value) {
         usb_device_attach(dev, &err);

-        if (err) {
-            error_propagate(errp, err);
-        }
+        error_propagate(errp, err);

     } else {
         usb_device_detach(dev);
     }
     } else {
         usb_device_detach(dev);
     }