[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC PATCH V8 05/15] virtio-device : Refactor virtio-de
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] [RFC PATCH V8 05/15] virtio-device : Refactor virtio-device. |
Date: |
Wed, 02 Jan 2013 08:15:33 -0600 |
User-agent: |
Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) |
address@hidden writes:
> From: KONRAD Frederic <address@hidden>
>
> Create the virtio-device which is abstract. All the virtio-device can extend
> this class.
>
> Signed-off-by: KONRAD Frederic <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
Regards,
Anthony Liguori
> ---
> hw/virtio.c | 70
> ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
> hw/virtio.h | 31 +++++++++++++++++++++++++++
> 2 files changed, 89 insertions(+), 12 deletions(-)
>
> diff --git a/hw/virtio.c b/hw/virtio.c
> index f40a8c5..e40fa12 100644
> --- a/hw/virtio.c
> +++ b/hw/virtio.c
> @@ -16,6 +16,7 @@
> #include "trace.h"
> #include "qemu-error.h"
> #include "virtio.h"
> +#include "virtio-bus.h"
> #include "qemu-barrier.h"
>
> /* The alignment to use between consumer and producer parts of vring.
> @@ -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)
> diff --git a/hw/virtio.h b/hw/virtio.h
> index 7c17f7b..98596a9 100644
> --- a/hw/virtio.h
> +++ b/hw/virtio.h
> @@ -108,8 +108,17 @@ typedef struct {
>
> #define VIRTIO_NO_VECTOR 0xffff
>
> +#define TYPE_VIRTIO_DEVICE "virtio-device"
> +#define VIRTIO_DEVICE_GET_CLASS(obj) \
> + OBJECT_GET_CLASS(VirtioDeviceClass, obj, TYPE_VIRTIO_DEVICE)
> +#define VIRTIO_DEVICE_CLASS(klass) \
> + OBJECT_CLASS_CHECK(VirtioDeviceClass, klass, TYPE_VIRTIO_DEVICE)
> +#define VIRTIO_DEVICE(obj) \
> + OBJECT_CHECK(VirtIODevice, (obj), TYPE_VIRTIO_DEVICE)
> +
> struct VirtIODevice
> {
> + DeviceState parent_obj;
> const char *name;
> uint8_t status;
> uint8_t isr;
> @@ -119,6 +128,10 @@ struct VirtIODevice
> void *config;
> uint16_t config_vector;
> int nvectors;
> + /*
> + * Will be removed ( at the end of the series ) as we have it in
> + * VirtioDeviceClass.
> + */
> uint32_t (*get_features)(VirtIODevice *vdev, uint32_t
> requested_features);
> uint32_t (*bad_features)(VirtIODevice *vdev);
> void (*set_features)(VirtIODevice *vdev, uint32_t val);
> @@ -126,6 +139,7 @@ struct VirtIODevice
> void (*set_config)(VirtIODevice *vdev, const uint8_t *config);
> void (*reset)(VirtIODevice *vdev);
> void (*set_status)(VirtIODevice *vdev, uint8_t val);
> + /***/
> VirtQueue *vq;
> const VirtIOBindings *binding;
> void *binding_opaque;
> @@ -134,6 +148,23 @@ struct VirtIODevice
> VMChangeStateEntry *vmstate;
> };
>
> +typedef struct {
> + /* This is what a VirtioDevice must implement */
> + DeviceClass parent;
> + int (*init)(VirtIODevice *vdev);
> + uint32_t (*get_features)(VirtIODevice *vdev, uint32_t
> requested_features);
> + uint32_t (*bad_features)(VirtIODevice *vdev);
> + void (*set_features)(VirtIODevice *vdev, uint32_t val);
> + void (*get_config)(VirtIODevice *vdev, uint8_t *config);
> + void (*set_config)(VirtIODevice *vdev, const uint8_t *config);
> + void (*reset)(VirtIODevice *vdev);
> + void (*set_status)(VirtIODevice *vdev, uint8_t val);
> +} VirtioDeviceClass;
> +
> +void virtio_init(VirtIODevice *vdev, const char *name,
> + uint16_t device_id, size_t config_size);
> +void virtio_common_cleanup(VirtIODevice *vdev);
> +
> VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
> void (*handle_output)(VirtIODevice *,
> VirtQueue *));
> --
> 1.7.11.7
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [RFC PATCH V8 05/15] virtio-device : Refactor virtio-device.,
Anthony Liguori <=