Message ID | 1354295530-18644-6-git-send-email-fred.konrad@greensocs.com |
---|---|
State | New |
Headers | show |
On 30 November 2012 17:12, <fred.konrad@greensocs.com> wrote: > From: KONRAD Frederic <fred.konrad@greensocs.com> > > Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> > --- > hw/virtio.c | 28 ++++++++++++++++++++++++++++ > hw/virtio.h | 27 +++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+), 0 deletions(-) > > diff --git a/hw/virtio.c b/hw/virtio.c > index f40a8c5..1c72d17 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. > @@ -1056,3 +1057,30 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq) > { > return &vq->host_notifier; > } > + > +/* > + * Refactored VirtioDevice. > + */ > + > +static void virtio_device_class_init(ObjectClass *klass, void *data) > +{ > + /* Set the default value here. */ > + DeviceClass *dc = DEVICE_CLASS(klass); > + 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..b890eb1 100644 > --- a/hw/virtio.h > +++ b/hw/virtio.h > @@ -108,8 +108,22 @@ typedef struct { > > #define VIRTIO_NO_VECTOR 0xffff > > +/* > + * Refactored VirtioDevice. This isn't a useful comment. Something like "Base class for virtio backends (blk, net, etc)" would be more helpful. > + */ > + > +#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) > + > +/* This should be renammed VirtioDeviceState at the end. */ "renamed", but does it really need renaming? > struct VirtIODevice > { > + DeviceState parent_obj; > const char *name; > uint8_t status; > uint8_t isr; > @@ -134,6 +148,18 @@ struct VirtIODevice > VMChangeStateEntry *vmstate; > }; > > +typedef struct { > + /* This is what a VirtioDevice must implement */ > + DeviceClass parent; > + 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; > + > VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, > void (*handle_output)(VirtIODevice *, > VirtQueue *)); > @@ -244,4 +270,5 @@ void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign, > bool set_handler); > void virtio_queue_notify_vq(VirtQueue *vq); > void virtio_irq(VirtQueue *vq); > + Don't introduce stray blank lines in patches. > #endif > -- > 1.7.1 > -- PMM
diff --git a/hw/virtio.c b/hw/virtio.c index f40a8c5..1c72d17 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. @@ -1056,3 +1057,30 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq) { return &vq->host_notifier; } + +/* + * Refactored VirtioDevice. + */ + +static void virtio_device_class_init(ObjectClass *klass, void *data) +{ + /* Set the default value here. */ + DeviceClass *dc = DEVICE_CLASS(klass); + 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..b890eb1 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -108,8 +108,22 @@ typedef struct { #define VIRTIO_NO_VECTOR 0xffff +/* + * Refactored VirtioDevice. + */ + +#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) + +/* This should be renammed VirtioDeviceState at the end. */ struct VirtIODevice { + DeviceState parent_obj; const char *name; uint8_t status; uint8_t isr; @@ -134,6 +148,18 @@ struct VirtIODevice VMChangeStateEntry *vmstate; }; +typedef struct { + /* This is what a VirtioDevice must implement */ + DeviceClass parent; + 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; + VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, void (*handle_output)(VirtIODevice *, VirtQueue *)); @@ -244,4 +270,5 @@ void virtio_queue_set_host_notifier_fd_handler(VirtQueue *vq, bool assign, bool set_handler); void virtio_queue_notify_vq(VirtQueue *vq); void virtio_irq(VirtQueue *vq); + #endif