aboutsummaryrefslogtreecommitdiffstats
path: root/usb-redir.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-02-03 17:39:57 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-06 10:16:50 -0600
commit3bc36349722a6f0d96ec9d8dc870aa82ae6de4cd (patch)
treef527e881e462896f0dc541b2c0ae8b2c013b9e2d /usb-redir.c
parent53a19a30527863f0257436de28d2b01ae043aaf0 (diff)
usb-redir: convert to QOM
This was missed due to the fact that it's in the top level and it uses 'struct DeviceInfo' instead of 'DeviceInfo' for some strange reason. Tested-by: BenoƮt Canet <benoit.canet@gmail.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'usb-redir.c')
-rw-r--r--usb-redir.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/usb-redir.c b/usb-redir.c
index 8f4a29a21..303292acd 100644
--- a/usb-redir.c
+++ b/usb-redir.c
@@ -1315,9 +1315,16 @@ static void usbredir_interrupt_packet(void *priv, uint32_t id,
}
}
+static Property usbredir_properties[] = {
+ DEFINE_PROP_CHR("chardev", USBRedirDevice, cs),
+ DEFINE_PROP_UINT8("debug", USBRedirDevice, debug, 0),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
static void usbredir_class_initfn(ObjectClass *klass, void *data)
{
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
+ DeviceClass *dc = DEVICE_CLASS(klass);
uc->init = usbredir_initfn;
uc->product_desc = "USB Redirection Device";
@@ -1327,21 +1334,18 @@ static void usbredir_class_initfn(ObjectClass *klass, void *data)
uc->handle_reset = usbredir_handle_reset;
uc->handle_data = usbredir_handle_data;
uc->handle_control = usbredir_handle_control;
+ dc->props = usbredir_properties;
}
-static struct DeviceInfo usbredir_dev_info = {
- .name = "usb-redir",
- .size = sizeof(USBRedirDevice),
- .class_init= usbredir_class_initfn,
- .props = (Property[]) {
- DEFINE_PROP_CHR("chardev", USBRedirDevice, cs),
- DEFINE_PROP_UINT8("debug", USBRedirDevice, debug, 0),
- DEFINE_PROP_END_OF_LIST(),
- },
+static TypeInfo usbredir_dev_info = {
+ .name = "usb-redir",
+ .parent = TYPE_USB_DEVICE,
+ .instance_size = sizeof(USBRedirDevice),
+ .class_init = usbredir_class_initfn,
};
static void usbredir_register_devices(void)
{
- usb_qdev_register(&usbredir_dev_info, NULL, NULL);
+ type_register_static(&usbredir_dev_info);
}
device_init(usbredir_register_devices);