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-bt.c | |
parent | 212ad111683a5b5a79a74d6141a4b75f532a4c8f (diff) | |
download | hqemu-39bffca2030950ef6efe57c2fac8327a45ae1015.zip hqemu-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-bt.c')
-rw-r--r-- | hw/usb-bt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/hw/usb-bt.c b/hw/usb-bt.c index f497a44..90c3b0e 100644 --- a/hw/usb-bt.c +++ b/hw/usb-bt.c @@ -529,6 +529,7 @@ static const VMStateDescription vmstate_usb_bt = { static void usb_bt_class_initfn(ObjectClass *klass, void *data) { + DeviceClass *dc = DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass); uc->init = usb_bt_initfn; @@ -539,17 +540,18 @@ static void usb_bt_class_initfn(ObjectClass *klass, void *data) uc->handle_control = usb_bt_handle_control; uc->handle_data = usb_bt_handle_data; uc->handle_destroy = usb_bt_handle_destroy; + dc->vmsd = &vmstate_usb_bt; } -static struct DeviceInfo bt_info = { - .name = "usb-bt-dongle", - .size = sizeof(struct USBBtState), - .vmsd = &vmstate_usb_bt, - .class_init= usb_bt_class_initfn, +static TypeInfo bt_info = { + .name = "usb-bt-dongle", + .parent = TYPE_USB_DEVICE, + .instance_size = sizeof(struct USBBtState), + .class_init = usb_bt_class_initfn, }; static void usb_bt_register_devices(void) { - usb_qdev_register(&bt_info); + type_register_static(&bt_info); } device_init(usb_bt_register_devices) |