---
hw/usb-bt.c | 2 +-
hw/usb-bus.c | 51 +++++++++++++++++++++++++++++----------------------
hw/usb-ccid.c | 3 +--
hw/usb-hid.c | 45 ++++++++++++++++++++++-----------------------
hw/usb-hub.c | 2 +-
hw/usb-msd.c | 4 +---
hw/usb-net.c | 5 +----
hw/usb-serial.c | 9 ++-------
hw/usb-wacom.c | 3 +--
hw/usb.h | 8 +++-----
usb-bsd.c | 23 +++++++++++++++--------
usb-linux.c | 4 +---
usb-redir.c | 25 ++++++++++++++++---------
13 files changed, 94 insertions(+), 90 deletions(-)
diff --git a/hw/usb-bt.c b/hw/usb-bt.c
index fd71f1f..8dea574 100644
--- a/hw/usb-bt.c
+++ b/hw/usb-bt.c
@@ -572,6 +572,6 @@ static struct USBDeviceInfo bt_info = {
static void usb_bt_register_devices(void)
{
- usb_qdev_register(&bt_info);
+ usb_qdev_register(&bt_info, NULL, NULL);
}
device_init(usb_bt_register_devices)
diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index 46426db..b86d6c8 100644
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -191,20 +191,31 @@ static int usb_qdev_exit(DeviceState *qdev)
return 0;
}
-void usb_qdev_register(USBDeviceInfo *info)
+typedef struct LegacyUSBFactory
+{
+ const char *name;
+ const char *usbdevice_name;
+ USBDevice *(*usbdevice_init)(const char *params);
+} LegacyUSBFactory;
+
+static GSList *legacy_usb_factory;
+
+void usb_qdev_register(USBDeviceInfo *info,
+ const char *usbdevice_name,
+ USBDevice *(*usbdevice_init)(const char *params))
{
info->qdev.bus_info = &usb_bus_info;
info->qdev.init = usb_qdev_init;
info->qdev.unplug = qdev_simple_unplug_cb;
info->qdev.exit = usb_qdev_exit;
qdev_register_subclass(&info->qdev, TYPE_USB_DEVICE);
-}
-void usb_qdev_register_many(USBDeviceInfo *info)
-{
- while (info->qdev.name) {
- usb_qdev_register(info);
- info++;
+ if (usbdevice_name) {
+ LegacyUSBFactory *f = g_malloc0(sizeof(*f));
+ f->name = info->qdev.name;
+ f->usbdevice_name = usbdevice_name;
+ f->usbdevice_init = usbdevice_init;
+ legacy_usb_factory = g_slist_append(legacy_usb_factory, f);
}
}
@@ -514,8 +525,8 @@ void usb_info(Monitor *mon)
USBDevice *usbdevice_create(const char *cmdline)
{
USBBus *bus = usb_bus_find(-1 /* any */);
- DeviceInfo *info;
- USBDeviceInfo *usb;
+ LegacyUSBFactory *f = NULL;
+ GSList *i;
char driver[32];
const char *params;
int len;
@@ -532,17 +543,13 @@ USBDevice *usbdevice_create(const char *cmdline)
pstrcpy(driver, sizeof(driver), cmdline);
}
- for (info = device_info_list; info != NULL; info = info->next) {
- if (info->bus_info != &usb_bus_info)
- continue;
- usb = DO_UPCAST(USBDeviceInfo, qdev, info);
- if (usb->usbdevice_name == NULL)
- continue;
- if (strcmp(usb->usbdevice_name, driver) != 0)
- continue;
- break;
+ for (i = legacy_usb_factory; i; i = i->next) {
+ f = i->data;
+ if (strcmp(f->usbdevice_name, driver) == 0) {
+ break;
+ }
}
- if (info == NULL) {
+ if (i == NULL) {
#if 0
/* no error because some drivers are not converted (yet) */
error_report("usbdevice %s not found", driver);
@@ -550,14 +557,14 @@ USBDevice *usbdevice_create(const char *cmdline)
return NULL;
}
- if (!usb->usbdevice_init) {
+ if (!f->usbdevice_init) {
if (*params) {
error_report("usbdevice %s accepts no params", driver);
return NULL;
}
- return usb_create_simple(bus, usb->qdev.name);
+ return usb_create_simple(bus, f->name);
}
- return usb->usbdevice_init(params);
+ return f->usbdevice_init(params);
}
static TypeInfo usb_device_type_info = {
diff --git a/hw/usb-ccid.c b/hw/usb-ccid.c
index db67837..24b1a1f 100644
--- a/hw/usb-ccid.c
+++ b/hw/usb-ccid.c
@@ -1318,7 +1318,6 @@ static struct USBDeviceInfo ccid_info = {
DEFINE_PROP_UINT8("debug", USBCCIDState, debug, 0),
DEFINE_PROP_END_OF_LIST(),
},
- .usbdevice_name = "ccid",
};
static TypeInfo ccid_card_type_info = {
@@ -1332,6 +1331,6 @@ static TypeInfo ccid_card_type_info = {
static void ccid_register_devices(void)
{
type_register_static(&ccid_card_type_info);
- usb_qdev_register(&ccid_info);
+ usb_qdev_register(&ccid_info, "ccid", NULL);
}
device_init(ccid_register_devices)
diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index dc6bc78..75642cf 100644
--- a/hw/usb-hid.c
+++ b/hw/usb-hid.c
@@ -574,6 +574,13 @@ static void usb_tablet_class_initfn(ObjectClass *klass,
void *data)
uc->handle_destroy = usb_hid_handle_destroy;
}
+static struct USBDeviceInfo usb_tablet_info = {
+ .qdev.name = "usb-tablet",
+ .qdev.size = sizeof(USBHIDState),
+ .qdev.vmsd = &vmstate_usb_ptr,
+ .qdev.class_init= usb_tablet_class_initfn,
+};
+
static void usb_mouse_class_initfn(ObjectClass *klass, void *data)
{
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
@@ -588,6 +595,13 @@ static void usb_mouse_class_initfn(ObjectClass *klass,
void *data)
uc->handle_destroy = usb_hid_handle_destroy;
}
+static struct USBDeviceInfo usb_mouse_info = {
+ .qdev.name = "usb-mouse",
+ .qdev.size = sizeof(USBHIDState),
+ .qdev.vmsd = &vmstate_usb_ptr,
+ .qdev.class_init= usb_mouse_class_initfn,
+};
+
static void usb_keyboard_class_initfn(ObjectClass *klass, void *data)
{
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
@@ -602,32 +616,17 @@ static void usb_keyboard_class_initfn(ObjectClass *klass,
void *data)
uc->handle_destroy = usb_hid_handle_destroy;
}
-static struct USBDeviceInfo hid_info[] = {
- {
- .qdev.name = "usb-tablet",
- .qdev.size = sizeof(USBHIDState),
- .qdev.vmsd = &vmstate_usb_ptr,
- .qdev.class_init= usb_tablet_class_initfn,
- .usbdevice_name = "tablet",
- },{
- .qdev.name = "usb-mouse",
- .qdev.size = sizeof(USBHIDState),
- .qdev.vmsd = &vmstate_usb_ptr,
- .qdev.class_init= usb_mouse_class_initfn,
- .usbdevice_name = "mouse",
- },{
- .qdev.name = "usb-kbd",
- .qdev.size = sizeof(USBHIDState),
- .qdev.vmsd = &vmstate_usb_kbd,
- .qdev.class_init= usb_keyboard_class_initfn,
- .usbdevice_name = "keyboard",
- },{
- /* end of list */
- }
+static struct USBDeviceInfo usb_keyboard_info = {
+ .qdev.name = "usb-kbd",
+ .qdev.size = sizeof(USBHIDState),
+ .qdev.vmsd = &vmstate_usb_kbd,
+ .qdev.class_init= usb_keyboard_class_initfn,
};
static void usb_hid_register_devices(void)
{
- usb_qdev_register_many(hid_info);
+ usb_qdev_register(&usb_tablet_info, "tablet", NULL);
+ usb_qdev_register(&usb_mouse_info, "mouse", NULL);
+ usb_qdev_register(&usb_keyboard_info, "keyboard", NULL);
}
device_init(usb_hid_register_devices)
diff --git a/hw/usb-hub.c b/hw/usb-hub.c
index 5a52964..b5114dd 100644
--- a/hw/usb-hub.c
+++ b/hw/usb-hub.c
@@ -564,6 +564,6 @@ static struct USBDeviceInfo hub_info = {
static void usb_hub_register_devices(void)
{
- usb_qdev_register(&hub_info);
+ usb_qdev_register(&hub_info, NULL, NULL);
}
device_init(usb_hub_register_devices)
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index bb63a6a..a6226b4 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -661,12 +661,10 @@ static struct USBDeviceInfo msd_info = {
DEFINE_PROP_BIT("removable", MSDState, removable, 0, false),
DEFINE_PROP_END_OF_LIST(),
},
- .usbdevice_name = "disk",
- .usbdevice_init = usb_msd_init,
};
static void usb_msd_register_devices(void)
{
- usb_qdev_register(&msd_info);
+ usb_qdev_register(&msd_info, "disk", usb_msd_init);
}
device_init(usb_msd_register_devices)
diff --git a/hw/usb-net.c b/hw/usb-net.c
index 50c66d7..1f14b27 100644
--- a/hw/usb-net.c
+++ b/hw/usb-net.c
@@ -1422,13 +1422,10 @@ static struct USBDeviceInfo net_info = {
DEFINE_NIC_PROPERTIES(USBNetState, conf),
DEFINE_PROP_END_OF_LIST(),
},
-
- .usbdevice_name = "net",
- .usbdevice_init = usb_net_init,
};
static void usb_net_register_devices(void)
{
- usb_qdev_register(&net_info);
+ usb_qdev_register(&net_info, "net", usb_net_init);
}
device_init(usb_net_register_devices)
diff --git a/hw/usb-serial.c b/hw/usb-serial.c
index 33d6163..407ca72 100644
--- a/hw/usb-serial.c
+++ b/hw/usb-serial.c
@@ -600,9 +600,6 @@ static struct USBDeviceInfo serial_info = {
DEFINE_PROP_CHR("chardev", USBSerialState, cs),
DEFINE_PROP_END_OF_LIST(),
},
-
- .usbdevice_name = "serial",
- .usbdevice_init = usb_serial_init,
};
static void usb_braille_class_initfn(ObjectClass *klass, void *data)
@@ -628,13 +625,11 @@ static struct USBDeviceInfo braille_info = {
DEFINE_PROP_CHR("chardev", USBSerialState, cs),
DEFINE_PROP_END_OF_LIST(),
},
- .usbdevice_name = "braille",
- .usbdevice_init = usb_braille_init,
};
static void usb_serial_register_devices(void)
{
- usb_qdev_register(&serial_info);
- usb_qdev_register(&braille_info);
+ usb_qdev_register(&serial_info, "serial", usb_serial_init);
+ usb_qdev_register(&braille_info, "braille", usb_braille_init);
}
device_init(usb_serial_register_devices)
diff --git a/hw/usb-wacom.c b/hw/usb-wacom.c
index 448b8f2..4a671ef 100644
--- a/hw/usb-wacom.c
+++ b/hw/usb-wacom.c
@@ -376,11 +376,10 @@ static struct USBDeviceInfo wacom_info = {
.qdev.size = sizeof(USBWacomState),
.qdev.vmsd = &vmstate_usb_wacom,
.qdev.class_init= usb_wacom_class_init,
- .usbdevice_name = "wacom-tablet",
};
static void usb_wacom_register_devices(void)
{
- usb_qdev_register(&wacom_info);
+ usb_qdev_register(&wacom_info, "wacom-tablet", NULL);
}
device_init(usb_wacom_register_devices)
diff --git a/hw/usb.h b/hw/usb.h
index 602ddb9..eac0bf5 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -258,9 +258,6 @@ struct USBDevice {
struct USBDeviceInfo {
DeviceInfo qdev;
- /* handle legacy -usbdevice command line options */
- const char *usbdevice_name;
- USBDevice *(*usbdevice_init)(const char *params);
};
typedef struct USBPortOps {
@@ -384,8 +381,9 @@ struct USBBusOps {
void usb_bus_new(USBBus *bus, USBBusOps *ops, DeviceState *host);
USBBus *usb_bus_find(int busnr);
-void usb_qdev_register(USBDeviceInfo *info);
-void usb_qdev_register_many(USBDeviceInfo *info);
+void usb_qdev_register(USBDeviceInfo *info,
+ const char *usbdevice_name,
+ USBDevice *(*usbdevice_init)(const char *params));
USBDevice *usb_create(USBBus *bus, const char *name);
USBDevice *usb_create_simple(USBBus *bus, const char *name);
USBDevice *usbdevice_create(const char *cmdline);
diff --git a/usb-bsd.c b/usb-bsd.c
index 1187552..8637c77 100644
--- a/usb-bsd.c
+++ b/usb-bsd.c
@@ -397,21 +397,28 @@ fail:
return ret;
}
+static void usb_host_class_initfn(ObjectClass *klass, void *data)
+{
+ USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
+
+ uc->product_desc = "USB Host Device";
+ uc->init = usb_host_initfn;
+ uc->handle_packet = usb_generic_handle_packet;
+ uc->handle_reset = usb_host_handle_reset;
+ uc->handle_control = usb_host_handle_control;
+ uc->handle_data = usb_host_handle_data;
+ uc->handle_destroy = usb_host_handle_destroy;
+}
+
static struct USBDeviceInfo usb_host_dev_info = {
- .product_desc = "USB Host Device",
.qdev.name = "usb-host",
.qdev.size = sizeof(USBHostDevice),
- .init = usb_host_initfn,
- .handle_packet = usb_generic_handle_packet,
- .handle_reset = usb_host_handle_reset,
- .handle_control = usb_host_handle_control,
- .handle_data = usb_host_handle_data,
- .handle_destroy = usb_host_handle_destroy,
+ .qdev.class_init= usb_host_initfn,
};
static void usb_host_register_devices(void)
{
- usb_qdev_register(&usb_host_dev_info);
+ usb_qdev_register(&usb_host_dev_info, NULL, NULL);
}
device_init(usb_host_register_devices)
diff --git a/usb-linux.c b/usb-linux.c
index 15e3d5e..6dbcf2a 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -1456,13 +1456,11 @@ static struct USBDeviceInfo usb_host_dev_info = {
DEFINE_PROP_UINT32("isobufs", USBHostDevice, iso_urb_count, 4),
DEFINE_PROP_END_OF_LIST(),
},
- .usbdevice_name = "host",
- .usbdevice_init = usb_host_device_open,
};
static void usb_host_register_devices(void)
{
- usb_qdev_register(&usb_host_dev_info);
+ usb_qdev_register(&usb_host_dev_info, "host", usb_host_device_open);
}
device_init(usb_host_register_devices)
diff --git a/usb-redir.c b/usb-redir.c
index fb91c92..a297501 100644
--- a/usb-redir.c
+++ b/usb-redir.c
@@ -1227,17 +1227,24 @@ static void usbredir_interrupt_packet(void *priv,
uint32_t id,
}
}
+static void usbredir_class_initfn(ObjectClass *klass, void *data)
+{
+ USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
+
+ uc->init = usbredir_initfn;
+ uc->product_desc = "USB Redirection Device";
+ uc->handle_destroy = usbredir_handle_destroy;
+ uc->handle_packet = usb_generic_handle_packet;
+ uc->cancel_packet = usbredir_cancel_packet;
+ uc->handle_reset = usbredir_handle_reset;
+ uc->handle_data = usbredir_handle_data;
+ uc->handle_control = usbredir_handle_control;
+}
+
static struct USBDeviceInfo usbredir_dev_info = {
- .product_desc = "USB Redirection Device",
.qdev.name = "usb-redir",
.qdev.size = sizeof(USBRedirDevice),
- .init = usbredir_initfn,
- .handle_destroy = usbredir_handle_destroy,
- .handle_packet = usb_generic_handle_packet,
- .cancel_packet = usbredir_cancel_packet,
- .handle_reset = usbredir_handle_reset,
- .handle_data = usbredir_handle_data,
- .handle_control = usbredir_handle_control,
+ .qdev.class_init= usbredir_class_initfn,
.qdev.props = (Property[]) {
DEFINE_PROP_CHR("chardev", USBRedirDevice, cs),
DEFINE_PROP_UINT8("debug", USBRedirDevice, debug, 0),
@@ -1247,6 +1254,6 @@ static struct USBDeviceInfo usbredir_dev_info = {
static void usbredir_register_devices(void)
{
- usb_qdev_register(&usbredir_dev_info);
+ usb_qdev_register(&usbredir_dev_info, NULL, NULL);
}
device_init(usbredir_register_devices);
--
1.7.4.1
