qdev: Separate USB product description from qdev name

Using the qdev name for the product description makes for inconvenient
qdev names.

Put the product description in new USBDeviceInfo member product_desc.
Make usb_qdev_init() use it.  No user or guest visible change, since
the value is still the same.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/usb-bt.c b/hw/usb-bt.c
index 18d7a98b43968c2ddf7658248c0bbf1f3c95b152..07da1337edce454f8ed11b9ef7fa1d52ee280ff3 100644 (file)
--- a/hw/usb-bt.c
+++ b/hw/usb-bt.c
@@ -645,6 +645,7 @@ USBDevice *usb_bt_init(HCIInfo *hci)
 }
 
 static struct USBDeviceInfo bt_info = {
+    .product_desc   = "QEMU BT dongle",
     .qdev.name      = "QEMU BT dongle",
     .qdev.size      = sizeof(struct USBBtState),
     .init           = usb_bt_initfn,

diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index ba1b6e30e9c748831ffc016f002da12361d40e85..8bbc80d6b1f3eadc394cf8e859f10f11a4679fca 100644 (file)
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -43,7 +43,7 @@ static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base)
     USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, base);
     int rc;
 
-    pstrcpy(dev->product_desc, sizeof(dev->product_desc), qdev->info->name);
+    pstrcpy(dev->product_desc, sizeof(dev->product_desc), info->product_desc);
     dev->info = info;
     dev->auto_attach = 1;
     rc = dev->info->init(dev);

diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index 6621f7227e94cd40610be1324db40e2211a77bf5..33de302d6636c85f7bcd020c33286dc181b2859c 100644 (file)
--- a/hw/usb-hid.c
+++ b/hw/usb-hid.c
@@ -880,6 +880,7 @@ void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *))
 
 static struct USBDeviceInfo hid_info[] = {
     {
+        .product_desc   = "QEMU USB Tablet",
         .qdev.name      = "QEMU USB Tablet",
         .qdev.alias     = "usb-tablet",
         .usbdevice_name = "tablet",
@@ -891,6 +892,7 @@ static struct USBDeviceInfo hid_info[] = {
         .handle_data    = usb_hid_handle_data,
         .handle_destroy = usb_hid_handle_destroy,
     },{
+        .product_desc   = "QEMU USB Mouse",
         .qdev.name      = "QEMU USB Mouse",
         .qdev.alias     = "usb-mouse",
         .usbdevice_name = "mouse",
@@ -902,6 +904,7 @@ static struct USBDeviceInfo hid_info[] = {
         .handle_data    = usb_hid_handle_data,
         .handle_destroy = usb_hid_handle_destroy,
     },{
+        .product_desc   = "QEMU USB Keyboard",
         .qdev.name      = "QEMU USB Keyboard",
         .qdev.alias     = "usb-kbd",
         .usbdevice_name = "keyboard",

diff --git a/hw/usb-hub.c b/hw/usb-hub.c
index e5a09387769488c0389c6b4a60fb9b7de8b69c9c..32f2ab8c73638afd25ad77dac658a709f2f91c83 100644 (file)
--- a/hw/usb-hub.c
+++ b/hw/usb-hub.c
@@ -544,6 +544,7 @@ static int usb_hub_initfn(USBDevice *dev)
 }
 
 static struct USBDeviceInfo hub_info = {
+    .product_desc   = "QEMU USB Hub",
     .qdev.name      = "QEMU USB Hub",
     .qdev.size      = sizeof(USBHubState),
     .init           = usb_hub_initfn,

diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index bb39b625adfdffa7d808f65d39c1e8656ac8fc5b..b9f6588a7ae8e09c75b6c4fd67882e2633a28af6 100644 (file)
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -600,6 +600,7 @@ static USBDevice *usb_msd_init(const char *filename)
 }
 
 static struct USBDeviceInfo msd_info = {
+    .product_desc   = "QEMU USB MSD",
     .qdev.name      = "QEMU USB MSD",
     .qdev.alias     = "usb-storage",
     .qdev.size      = sizeof(MSDState),

diff --git a/hw/usb-net.c b/hw/usb-net.c
index 2556e05dd54c8aa24938745646a72c56fda696be..3dd05e370ae6ec6cdd45cc0b56647f49880ef74d 100644 (file)
--- a/hw/usb-net.c
+++ b/hw/usb-net.c
@@ -1487,6 +1487,7 @@ USBDevice *usb_net_init(NICInfo *nd)
 }
 
 static struct USBDeviceInfo net_info = {
+    .product_desc   = "QEMU USB Network Interface",
     .qdev.name      = "QEMU USB Network Interface",
     .qdev.size      = sizeof(USBNetState),
     .init           = usb_net_initfn,

diff --git a/hw/usb-serial.c b/hw/usb-serial.c
index 223d4c3859e2aa11db335d848cb75310fb9ce739..14e410ed9c57734b7627ab22584051825a42117b 100644 (file)
--- a/hw/usb-serial.c
+++ b/hw/usb-serial.c
@@ -605,6 +605,7 @@ static USBDevice *usb_braille_init(const char *unused)
 }
 
 static struct USBDeviceInfo serial_info = {
+    .product_desc   = "QEMU USB Serial",
     .qdev.name      = "QEMU USB Serial",
     .qdev.alias     = "usb-serial",
     .qdev.size      = sizeof(USBSerialState),
@@ -625,6 +626,7 @@ static struct USBDeviceInfo serial_info = {
 };
 
 static struct USBDeviceInfo braille_info = {
+    .product_desc   = "QEMU USB Braille",
     .qdev.name      = "QEMU USB Braille",
     .qdev.alias     = "usb-braille",
     .qdev.size      = sizeof(USBSerialState),

diff --git a/hw/usb-wacom.c b/hw/usb-wacom.c
index ef61376372798737cdd1143bb9af255db26cb279..b10864fe961b3aa7a62988c8724252ae8da27f35 100644 (file)
--- a/hw/usb-wacom.c
+++ b/hw/usb-wacom.c
@@ -409,6 +409,7 @@ static int usb_wacom_initfn(USBDevice *dev)
 }
 
 static struct USBDeviceInfo wacom_info = {
+    .product_desc   = "QEMU PenPartner Tablet",
     .qdev.name      = "QEMU PenPartner Tablet",
     .qdev.alias     = "wacom-tablet",
     .usbdevice_name = "wacom-tablet",

diff --git a/hw/usb.h b/hw/usb.h
index 39aba995f81b672e790b2cdcfd30fbab93b50baf..068458850eab9e5b43945e8a201f04d1ad5150f6 100644 (file)
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -185,6 +185,8 @@ struct USBDeviceInfo {
      */
     int (*handle_data)(USBDevice *dev, USBPacket *p);
 
+    const char *product_desc;
+
     /* handle legacy -usbdevice command line options */
     const char *usbdevice_name;
     USBDevice *(*usbdevice_init)(const char *params);

diff --git a/usb-bsd.c b/usb-bsd.c
index a9987d116d6a2a5e100bffd1f0ce0d6b7009f9b8..e72d123f9406cffa3d5bc43d0cff56c73ea9b7fb 100644 (file)
--- a/usb-bsd.c
+++ b/usb-bsd.c
@@ -393,6 +393,7 @@ fail:
 }
 
 static struct USBDeviceInfo usb_host_dev_info = {
+    .product_desc   = "USB Host Device",
     .qdev.name      = "USB Host Device",
     .qdev.size      = sizeof(USBHostDevice),
     .init           = usb_host_initfn,

diff --git a/usb-linux.c b/usb-linux.c
index 67735d338c87ba736a2f76773531b4477fb3f4e3..0004e969b6ef68da67299fc889edd2d2edbb1795 100644 (file)
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -979,6 +979,7 @@ static int usb_host_initfn(USBDevice *dev)
 }
 
 static struct USBDeviceInfo usb_host_dev_info = {
+    .product_desc   = "USB Host Device",
     .qdev.name      = "USB Host Device",
     .qdev.alias     = "usb-host",
     .qdev.size      = sizeof(USBHostDevice),