aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2009-12-09 17:07:52 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-12 08:17:28 -0600
commit5b6d0419d9a411d83a1078a146ee140482dcc02c (patch)
tree796339f8786c281c1556778d818b9a454ddf334f /hw/usb-hid.c
parentqdev: Rename USBDevice member devname to product_desc (diff)
downloadqemu-kvm-5b6d0419d9a411d83a1078a146ee140482dcc02c.tar.gz
qemu-kvm-5b6d0419d9a411d83a1078a146ee140482dcc02c.tar.bz2
qemu-kvm-5b6d0419d9a411d83a1078a146ee140482dcc02c.zip
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> (cherry picked from commit 063846984ce7eb1c1ddce6dda39b662c64a80dc0)
Diffstat (limited to 'hw/usb-hid.c')
-rw-r--r--hw/usb-hid.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index 6621f7227..33de302d6 100644
--- 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",