aboutsummaryrefslogtreecommitdiff
path: root/hw/usb-hid.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2009-12-09 17:07:53 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-12 08:17:28 -0600
commit72fbd9f97c11a981d2b235212bce20582f1494a9 (patch)
tree14e3f598143a08b8c89f83755680f13430218ca2 /hw/usb-hid.c
parent5b6d0419d9a411d83a1078a146ee140482dcc02c (diff)
qdev: Replace device names containing whitespace
Device names with whitespace require quoting in the shell and in the monitor. Some of the offenders are also overly long. Some have a more convenient alias, some don't. The place for verbose device names is DeviceInfo member desc. The name should be short & sweet. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 556cd09885bec3f69ba78228fe4e46dc1dad145b)
Diffstat (limited to 'hw/usb-hid.c')
-rw-r--r--hw/usb-hid.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index 33de302d66..6abb629937 100644
--- a/hw/usb-hid.c
+++ b/hw/usb-hid.c
@@ -881,8 +881,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",
+ .qdev.name = "usb-tablet",
.usbdevice_name = "tablet",
.qdev.size = sizeof(USBHIDState),
.init = usb_tablet_initfn,
@@ -893,8 +892,7 @@ static struct USBDeviceInfo hid_info[] = {
.handle_destroy = usb_hid_handle_destroy,
},{
.product_desc = "QEMU USB Mouse",
- .qdev.name = "QEMU USB Mouse",
- .qdev.alias = "usb-mouse",
+ .qdev.name = "usb-mouse",
.usbdevice_name = "mouse",
.qdev.size = sizeof(USBHIDState),
.init = usb_mouse_initfn,
@@ -905,8 +903,7 @@ static struct USBDeviceInfo hid_info[] = {
.handle_destroy = usb_hid_handle_destroy,
},{
.product_desc = "QEMU USB Keyboard",
- .qdev.name = "QEMU USB Keyboard",
- .qdev.alias = "usb-kbd",
+ .qdev.name = "usb-kbd",
.usbdevice_name = "keyboard",
.qdev.size = sizeof(USBHIDState),
.init = usb_keyboard_initfn,