diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-06-04 12:34:33 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-06-10 18:15:06 +0200 |
| commit | 588255ad5021f06789f438f7b045015c54e30841 (patch) | |
| tree | 7636ff9d9530f34873829460a944f3381d1f50d2 | |
| parent | 40de55affda76392627e68d3b1ba5a6a11c492bc (diff) | |
| download | focaccia-qemu-588255ad5021f06789f438f7b045015c54e30841.tar.gz focaccia-qemu-588255ad5021f06789f438f7b045015c54e30841.zip | |
virtio-pci: add struct VirtIOPCIRegion for virtio-1 regions
For now just place the MemoryRegion there, following patches will add more. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/virtio/virtio-pci.c | 20 | ||||
| -rw-r--r-- | hw/virtio/virtio-pci.h | 12 |
2 files changed, 19 insertions, 13 deletions
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index b7beddd6c1..ebba2d1e51 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -145,7 +145,7 @@ static int virtio_pci_set_host_notifier_internal(VirtIOPCIProxy *proxy, EventNotifier *notifier = virtio_queue_get_host_notifier(vq); bool legacy = !(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_LEGACY); bool modern = !(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_MODERN); - MemoryRegion *modern_mr = &proxy->notify; + MemoryRegion *modern_mr = &proxy->notify.mr; MemoryRegion *legacy_mr = &proxy->bar; hwaddr modern_addr = QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * virtio_get_queue_index(vq); @@ -1340,28 +1340,30 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) memory_region_init(&proxy->modern_bar, OBJECT(proxy), "virtio-pci", 2 * QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * VIRTIO_QUEUE_MAX); - memory_region_init_io(&proxy->common, OBJECT(proxy), + memory_region_init_io(&proxy->common.mr, OBJECT(proxy), &common_ops, proxy, "virtio-pci-common", 0x1000); - memory_region_add_subregion(&proxy->modern_bar, 0, &proxy->common); - memory_region_init_io(&proxy->isr, OBJECT(proxy), + memory_region_add_subregion(&proxy->modern_bar, 0, &proxy->common.mr); + memory_region_init_io(&proxy->isr.mr, OBJECT(proxy), &isr_ops, proxy, "virtio-pci-isr", 0x1000); - memory_region_add_subregion(&proxy->modern_bar, 0x1000, &proxy->isr); - memory_region_init_io(&proxy->device, OBJECT(proxy), + memory_region_add_subregion(&proxy->modern_bar, 0x1000, &proxy->isr.mr); + memory_region_init_io(&proxy->device.mr, OBJECT(proxy), &device_ops, virtio_bus_get_device(&proxy->bus), "virtio-pci-device", 0x1000); - memory_region_add_subregion(&proxy->modern_bar, 0x2000, &proxy->device); - memory_region_init_io(&proxy->notify, OBJECT(proxy), + memory_region_add_subregion(&proxy->modern_bar, 0x2000, + &proxy->device.mr); + memory_region_init_io(&proxy->notify.mr, OBJECT(proxy), ¬ify_ops, virtio_bus_get_device(&proxy->bus), "virtio-pci-notify", QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * VIRTIO_QUEUE_MAX); - memory_region_add_subregion(&proxy->modern_bar, 0x3000, &proxy->notify); + memory_region_add_subregion(&proxy->modern_bar, 0x3000, + &proxy->notify.mr); pci_register_bar(&proxy->pci_dev, modern_mem_bar, PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_PREFETCH | diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 4e9b2dbdac..8f1fc025d3 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -91,13 +91,17 @@ typedef struct VirtioPCIClass { void (*realize)(VirtIOPCIProxy *vpci_dev, Error **errp); } VirtioPCIClass; +typedef struct VirtIOPCIRegion { + MemoryRegion mr; +} VirtIOPCIRegion; + struct VirtIOPCIProxy { PCIDevice pci_dev; MemoryRegion bar; - MemoryRegion common; - MemoryRegion isr; - MemoryRegion device; - MemoryRegion notify; + VirtIOPCIRegion common; + VirtIOPCIRegion isr; + VirtIOPCIRegion device; + VirtIOPCIRegion notify; MemoryRegion modern_bar; uint32_t flags; uint32_t class_code; |