Message ID | 1355910821-21302-4-git-send-email-fred.konrad@greensocs.com |
---|---|
State | New |
Headers | show |
fred.konrad@greensocs.com writes: > From: KONRAD Frederic <fred.konrad@greensocs.com> > > Introduce virtio-pci-bus, which extends virtio-bus. It is used with virtio-pci > transport device. > > Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Regards, Anthony Liguori > --- > hw/virtio-pci.c | 37 +++++++++++++++++++++++++++++++++++++ > hw/virtio-pci.h | 19 +++++++++++++++++-- > 2 files changed, 54 insertions(+), 2 deletions(-) > > diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c > index 7684ac9..859a1ed 100644 > --- a/hw/virtio-pci.c > +++ b/hw/virtio-pci.c > @@ -32,6 +32,7 @@ > #include "blockdev.h" > #include "virtio-pci.h" > #include "range.h" > +#include "virtio-bus.h" > > /* from Linux's linux/virtio_pci.h */ > > @@ -1117,6 +1118,41 @@ static TypeInfo virtio_scsi_info = { > .class_init = virtio_scsi_class_init, > }; > > +/* virtio-pci-bus */ > + > +VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev) > +{ > + DeviceState *qdev = DEVICE(dev); > + BusState *qbus = qbus_create(TYPE_VIRTIO_PCI_BUS, qdev, NULL); > + VirtioBusState *bus = VIRTIO_BUS(qbus); > + qbus->allow_hotplug = 0; > + /* Only one virtio-device allowed for virtio-pci. */ > + qbus->max_dev = 1; > + return bus; > +} > + > +static void virtio_pci_bus_class_init(ObjectClass *klass, void *data) > +{ > + VirtioBusClass *k = VIRTIO_BUS_CLASS(klass); > + k->notify = virtio_pci_notify; > + k->save_config = virtio_pci_save_config; > + k->load_config = virtio_pci_load_config; > + k->save_queue = virtio_pci_save_queue; > + k->load_queue = virtio_pci_load_queue; > + k->get_features = virtio_pci_get_features; > + k->query_guest_notifiers = virtio_pci_query_guest_notifiers; > + k->set_host_notifier = virtio_pci_set_host_notifier; > + k->set_guest_notifiers = virtio_pci_set_guest_notifiers; > + k->vmstate_change = virtio_pci_vmstate_change; > +} > + > +static const TypeInfo virtio_pci_bus_info = { > + .name = TYPE_VIRTIO_PCI_BUS, > + .parent = TYPE_VIRTIO_BUS, > + .instance_size = sizeof(VirtioBusState), > + .class_init = virtio_pci_bus_class_init, > +}; > + > static void virtio_pci_register_types(void) > { > type_register_static(&virtio_blk_info); > @@ -1125,6 +1161,7 @@ static void virtio_pci_register_types(void) > type_register_static(&virtio_balloon_info); > type_register_static(&virtio_scsi_info); > type_register_static(&virtio_rng_info); > + type_register_static(&virtio_pci_bus_info); > } > > type_init(virtio_pci_register_types) > diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h > index b58d9a2..0e3288e 100644 > --- a/hw/virtio-pci.h > +++ b/hw/virtio-pci.h > @@ -20,6 +20,21 @@ > #include "virtio-rng.h" > #include "virtio-serial.h" > #include "virtio-scsi.h" > +#include "virtio-bus.h" > + > +/* VirtIOPCIProxy will be renammed VirtioPCIState at the end. */ > +typedef struct VirtIOPCIProxy VirtIOPCIProxy; > + > +/* virtio-pci-bus */ > +#define TYPE_VIRTIO_PCI_BUS "virtio-pci-bus" > +#define VIRTIO_PCI_BUS_GET_CLASS(obj) \ > + OBJECT_GET_CLASS(VirtioBusClass, obj, TYPE_VIRTIO_PCI_BUS) > +#define VIRTIO_PCI_BUS_CLASS(klass) \ > + OBJECT_CLASS_CHECK(VirtioBusClass, klass, TYPE_VIRTIO_PCI_BUS) > +#define VIRTIO_PCI_BUS(obj) \ > + OBJECT_CHECK(VirtioBusState, (obj), TYPE_VIRTIO_PCI_BUS) > + > +VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev); > > /* Performance improves when virtqueue kick processing is decoupled from the > * vcpu thread using ioeventfd for some devices. */ > @@ -31,7 +46,7 @@ typedef struct { > unsigned int users; > } VirtIOIRQFD; > > -typedef struct { > +struct VirtIOPCIProxy { > PCIDevice pci_dev; > VirtIODevice *vdev; > MemoryRegion bar; > @@ -51,7 +66,7 @@ typedef struct { > bool ioeventfd_disabled; > bool ioeventfd_started; > VirtIOIRQFD *vector_irqfd; > -} VirtIOPCIProxy; > +}; > > void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev); > void virtio_pci_reset(DeviceState *d); > -- > 1.7.11.7
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 7684ac9..859a1ed 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -32,6 +32,7 @@ #include "blockdev.h" #include "virtio-pci.h" #include "range.h" +#include "virtio-bus.h" /* from Linux's linux/virtio_pci.h */ @@ -1117,6 +1118,41 @@ static TypeInfo virtio_scsi_info = { .class_init = virtio_scsi_class_init, }; +/* virtio-pci-bus */ + +VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev) +{ + DeviceState *qdev = DEVICE(dev); + BusState *qbus = qbus_create(TYPE_VIRTIO_PCI_BUS, qdev, NULL); + VirtioBusState *bus = VIRTIO_BUS(qbus); + qbus->allow_hotplug = 0; + /* Only one virtio-device allowed for virtio-pci. */ + qbus->max_dev = 1; + return bus; +} + +static void virtio_pci_bus_class_init(ObjectClass *klass, void *data) +{ + VirtioBusClass *k = VIRTIO_BUS_CLASS(klass); + k->notify = virtio_pci_notify; + k->save_config = virtio_pci_save_config; + k->load_config = virtio_pci_load_config; + k->save_queue = virtio_pci_save_queue; + k->load_queue = virtio_pci_load_queue; + k->get_features = virtio_pci_get_features; + k->query_guest_notifiers = virtio_pci_query_guest_notifiers; + k->set_host_notifier = virtio_pci_set_host_notifier; + k->set_guest_notifiers = virtio_pci_set_guest_notifiers; + k->vmstate_change = virtio_pci_vmstate_change; +} + +static const TypeInfo virtio_pci_bus_info = { + .name = TYPE_VIRTIO_PCI_BUS, + .parent = TYPE_VIRTIO_BUS, + .instance_size = sizeof(VirtioBusState), + .class_init = virtio_pci_bus_class_init, +}; + static void virtio_pci_register_types(void) { type_register_static(&virtio_blk_info); @@ -1125,6 +1161,7 @@ static void virtio_pci_register_types(void) type_register_static(&virtio_balloon_info); type_register_static(&virtio_scsi_info); type_register_static(&virtio_rng_info); + type_register_static(&virtio_pci_bus_info); } type_init(virtio_pci_register_types) diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index b58d9a2..0e3288e 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -20,6 +20,21 @@ #include "virtio-rng.h" #include "virtio-serial.h" #include "virtio-scsi.h" +#include "virtio-bus.h" + +/* VirtIOPCIProxy will be renammed VirtioPCIState at the end. */ +typedef struct VirtIOPCIProxy VirtIOPCIProxy; + +/* virtio-pci-bus */ +#define TYPE_VIRTIO_PCI_BUS "virtio-pci-bus" +#define VIRTIO_PCI_BUS_GET_CLASS(obj) \ + OBJECT_GET_CLASS(VirtioBusClass, obj, TYPE_VIRTIO_PCI_BUS) +#define VIRTIO_PCI_BUS_CLASS(klass) \ + OBJECT_CLASS_CHECK(VirtioBusClass, klass, TYPE_VIRTIO_PCI_BUS) +#define VIRTIO_PCI_BUS(obj) \ + OBJECT_CHECK(VirtioBusState, (obj), TYPE_VIRTIO_PCI_BUS) + +VirtioBusState *virtio_pci_bus_new(VirtIOPCIProxy *dev); /* Performance improves when virtqueue kick processing is decoupled from the * vcpu thread using ioeventfd for some devices. */ @@ -31,7 +46,7 @@ typedef struct { unsigned int users; } VirtIOIRQFD; -typedef struct { +struct VirtIOPCIProxy { PCIDevice pci_dev; VirtIODevice *vdev; MemoryRegion bar; @@ -51,7 +66,7 @@ typedef struct { bool ioeventfd_disabled; bool ioeventfd_started; VirtIOIRQFD *vector_irqfd; -} VirtIOPCIProxy; +}; void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev); void virtio_pci_reset(DeviceState *d);