openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 063846984c)
This commit is contained in:
Markus Armbruster 2009-12-09 17:07:52 +01:00 committed by Anthony Liguori
parent 9df9eeeb18
commit 5b6d0419d9
11 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/usb-bt.c
View File

@ -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,

2
hw/usb-bus.c
View File

@ -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);

3
hw/usb-hid.c
View File

@ -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",

1
hw/usb-hub.c
View File

@ -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,

1
hw/usb-msd.c
View File

@ -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),

1
hw/usb-net.c
View File

@ -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,

2
hw/usb-serial.c
View File

@ -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),

1
hw/usb-wacom.c
View File

@ -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",

2
hw/usb.h
View File

@ -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);

1
usb-bsd.c
View File

@ -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,

1
usb-linux.c
View File

@ -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),