diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-07 21:34:16 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-03 10:41:06 -0600 |
| commit | 39bffca2030950ef6efe57c2fac8327a45ae1015 (patch) | |
| tree | 325262f44978e6116c9e43f688c900e08ee83738 /hw/usb-bus.c | |
| parent | 212ad111683a5b5a79a74d6141a4b75f532a4c8f (diff) | |
| download | qemu-39bffca2030950ef6efe57c2fac8327a45ae1015.tar.gz | |
qdev: register all types natively through QEMU Object Model
This was done in a mostly automated fashion. I did it in three steps and then
rebased it into a single step which avoids repeatedly touching every file in
the tree.
The first step was a sed-based addition of the parent type to the subclass
registration functions.
The second step was another sed-based removal of subclass registration functions
while also adding virtual functions from the base class into a class_init
function as appropriate.
Finally, a python script was used to convert the DeviceInfo structures and
qdev_register_subclass functions to TypeInfo structures, class_init functions,
and type_register_static calls.
We are almost fully converted to QOM after this commit.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb-bus.c')
| -rw-r--r-- | hw/usb-bus.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 6b0adfda19..d07f844657 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -220,15 +220,6 @@ void usb_legacy_register(const char *typename, const char *usbdevice_name, } } -void usb_qdev_register(DeviceInfo *info) -{ - info->bus_info = &usb_bus_info; - info->init = usb_qdev_init; - info->unplug = qdev_simple_unplug_cb; - info->exit = usb_qdev_exit; - qdev_register_subclass(info, TYPE_USB_DEVICE); -} - USBDevice *usb_create(USBBus *bus, const char *name) { DeviceState *dev; @@ -577,12 +568,22 @@ USBDevice *usbdevice_create(const char *cmdline) return f->usbdevice_init(params); } +static void usb_device_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *k = DEVICE_CLASS(klass); + k->bus_info = &usb_bus_info; + k->init = usb_qdev_init; + k->unplug = qdev_simple_unplug_cb; + k->exit = usb_qdev_exit; +} + static TypeInfo usb_device_type_info = { .name = TYPE_USB_DEVICE, .parent = TYPE_DEVICE, .instance_size = sizeof(USBDevice), .abstract = true, .class_size = sizeof(USBDeviceClass), + .class_init = usb_device_class_init, }; static void usb_register_devices(void) |