diff options
author | KONRAD Frederic <fred.konrad@greensocs.com> | 2013-01-15 00:08:02 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-21 13:23:12 -0600 |
commit | 8e05db9234050cb3f0ffb765608dd8b176334ae1 (patch) | |
tree | 416e9423918dc781faa542d02ab0cbbaa699f730 /hw/virtio.c | |
parent | ff8eca5536edd3f84bc87277e158e4db11dadf82 (diff) | |
download | qemu-8e05db9234050cb3f0ffb765608dd8b176334ae1.zip qemu-8e05db9234050cb3f0ffb765608dd8b176334ae1.tar.gz qemu-8e05db9234050cb3f0ffb765608dd8b176334ae1.tar.bz2 |
virtio-device: refactor virtio-device.
Create the virtio-device which is abstract. All the virtio-device can extend
this class. It also add some functions to virtio-bus.
Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/virtio.c')
-rw-r--r-- | hw/virtio.c | 70 |
1 files changed, 58 insertions, 12 deletions
diff --git a/hw/virtio.c b/hw/virtio.c index 77b53a9..ca170c3 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -17,6 +17,7 @@ #include "qemu/error-report.h" #include "virtio.h" #include "qemu/atomic.h" +#include "virtio-bus.h" /* The alignment to use between consumer and producer parts of vring. * x86 pagesize again. */ @@ -875,11 +876,16 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) return 0; } -void virtio_cleanup(VirtIODevice *vdev) +void virtio_common_cleanup(VirtIODevice *vdev) { qemu_del_vm_change_state_handler(vdev->vmstate); g_free(vdev->config); g_free(vdev->vq); +} + +void virtio_cleanup(VirtIODevice *vdev) +{ + virtio_common_cleanup(vdev); g_free(vdev); } @@ -902,14 +908,10 @@ static void virtio_vmstate_change(void *opaque, int running, RunState state) } } -VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, - size_t config_size, size_t struct_size) +void virtio_init(VirtIODevice *vdev, const char *name, + uint16_t device_id, size_t config_size) { - VirtIODevice *vdev; int i; - - vdev = g_malloc0(struct_size); - vdev->device_id = device_id; vdev->status = 0; vdev->isr = 0; @@ -917,20 +919,28 @@ VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, vdev->config_vector = VIRTIO_NO_VECTOR; vdev->vq = g_malloc0(sizeof(VirtQueue) * VIRTIO_PCI_QUEUE_MAX); vdev->vm_running = runstate_is_running(); - for(i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { + for (i = 0; i < VIRTIO_PCI_QUEUE_MAX; i++) { vdev->vq[i].vector = VIRTIO_NO_VECTOR; vdev->vq[i].vdev = vdev; } vdev->name = name; vdev->config_len = config_size; - if (vdev->config_len) + if (vdev->config_len) { vdev->config = g_malloc0(config_size); - else + } else { vdev->config = NULL; + } + vdev->vmstate = qemu_add_vm_change_state_handler(virtio_vmstate_change, + vdev); +} - vdev->vmstate = qemu_add_vm_change_state_handler(virtio_vmstate_change, vdev); - +VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, + size_t config_size, size_t struct_size) +{ + VirtIODevice *vdev; + vdev = g_malloc0(struct_size); + virtio_init(vdev, name, device_id, config_size); return vdev; } @@ -1056,3 +1066,39 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq) { return &vq->host_notifier; } + +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; + } + virtio_bus_plug_device(vdev); + 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->bus_type = TYPE_VIRTIO_BUS; +} + +static const TypeInfo virtio_device_info = { + .name = TYPE_VIRTIO_DEVICE, + .parent = TYPE_DEVICE, + .instance_size = sizeof(VirtIODevice), + .class_init = virtio_device_class_init, + .abstract = true, + .class_size = sizeof(VirtioDeviceClass), +}; + +static void virtio_register_types(void) +{ + type_register_static(&virtio_device_info); +} + +type_init(virtio_register_types) |