diff options
author | Andreas Färber <afaerber@suse.de> | 2013-07-30 00:50:27 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-09 21:46:49 +0100 |
commit | 1d244b42d200c02ad60eb564c75d8adea9243366 (patch) | |
tree | e8c32daaaccc6a737c7b03a22e2cdb4c7f5809f0 /hw/virtio | |
parent | 7598f0f30e027146ba70517a2bda98d16bac1e24 (diff) | |
download | qemu-1d244b42d200c02ad60eb564c75d8adea9243366.zip qemu-1d244b42d200c02ad60eb564c75d8adea9243366.tar.gz qemu-1d244b42d200c02ad60eb564c75d8adea9243366.tar.bz2 |
virtio: Start converting VirtioDevice to QOM realize
Temporarily allow either VirtioDeviceClass::init or
VirtioDeviceClass::realize.
Introduce VirtioDeviceClass::unrealize for symmetry.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/virtio')
-rw-r--r-- | hw/virtio/virtio.c | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 965b2c0..4070b37 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1150,40 +1150,52 @@ void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name) } } -static int virtio_device_init(DeviceState *qdev) -{ - VirtIODevice *vdev = VIRTIO_DEVICE(qdev); - VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(qdev); - assert(k->init != NULL); - if (k->init(vdev) < 0) { - return -1; +static void virtio_device_realize(DeviceState *dev, Error **errp) +{ + VirtIODevice *vdev = VIRTIO_DEVICE(dev); + VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(dev); + Error *err = NULL; + + assert(vdc->init != NULL || vdc->realize != NULL); + if (vdc->realize != NULL) { + vdc->realize(dev, &err); + if (err != NULL) { + error_propagate(errp, err); + return; + } + } else { + if (vdc->init(vdev) < 0) { + error_setg(errp, "Device initialization failed."); + return; + } } virtio_bus_device_plugged(vdev); - return 0; } -static int virtio_device_exit(DeviceState *qdev) +static void virtio_device_unrealize(DeviceState *dev, Error **errp) { - VirtIODevice *vdev = VIRTIO_DEVICE(qdev); - VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(qdev); + VirtIODevice *vdev = VIRTIO_DEVICE(dev); + VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(dev); virtio_bus_device_unplugged(vdev); - if (k->exit) { + + if (k->exit != NULL) { k->exit(vdev); } + if (vdev->bus_name) { g_free(vdev->bus_name); vdev->bus_name = NULL; } - return 0; } static void virtio_device_class_init(ObjectClass *klass, void *data) { /* Set the default value here. */ DeviceClass *dc = DEVICE_CLASS(klass); - dc->init = virtio_device_init; - dc->exit = virtio_device_exit; + + dc->realize = virtio_device_realize; + dc->unrealize = virtio_device_unrealize; dc->bus_type = TYPE_VIRTIO_BUS; } |