[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/33] virtio-pci: add virtio_pci_modern_regions_ini
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 25/33] virtio-pci: add virtio_pci_modern_regions_init() |
Date: |
Thu, 4 Jun 2015 12:34:34 +0200 |
Add init function for the modern pci regions,
move over the init code.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/virtio/virtio-pci.c | 117 +++++++++++++++++++++++++------------------------
1 file changed, 59 insertions(+), 58 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 26d7f74..fad8b80 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1201,6 +1201,64 @@ static void virtio_pci_device_write(void *opaque, hwaddr
addr,
}
}
+static void virtio_pci_modern_regions_init(VirtIOPCIProxy *proxy)
+{
+ static const MemoryRegionOps common_ops = {
+ .read = virtio_pci_common_read,
+ .write = virtio_pci_common_write,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 4,
+ },
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ };
+ static const MemoryRegionOps isr_ops = {
+ .read = virtio_pci_isr_read,
+ .write = virtio_pci_isr_write,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 4,
+ },
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ };
+ static const MemoryRegionOps device_ops = {
+ .read = virtio_pci_device_read,
+ .write = virtio_pci_device_write,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 4,
+ },
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ };
+ static const MemoryRegionOps notify_ops = {
+ .read = virtio_pci_notify_read,
+ .write = virtio_pci_notify_write,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 4,
+ },
+ .endianness = DEVICE_LITTLE_ENDIAN,
+ };
+
+ memory_region_init_io(&proxy->common.mr, OBJECT(proxy),
+ &common_ops,
+ proxy,
+ "virtio-pci-common", 0x1000);
+ memory_region_init_io(&proxy->isr.mr, OBJECT(proxy),
+ &isr_ops,
+ proxy,
+ "virtio-pci-isr", 0x1000);
+ memory_region_init_io(&proxy->device.mr, OBJECT(proxy),
+ &device_ops,
+ virtio_bus_get_device(&proxy->bus),
+ "virtio-pci-device", 0x1000);
+ 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);
+}
/* This is called by virtio-bus just after the device is plugged. */
static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
@@ -1283,46 +1341,6 @@ static void virtio_pci_device_plugged(DeviceState *d,
Error **errp)
cpu_to_le32(QEMU_VIRTIO_PCI_QUEUE_MEM_MULT),
};
- static const MemoryRegionOps common_ops = {
- .read = virtio_pci_common_read,
- .write = virtio_pci_common_write,
- .impl = {
- .min_access_size = 1,
- .max_access_size = 4,
- },
- .endianness = DEVICE_LITTLE_ENDIAN,
- };
-
- static const MemoryRegionOps isr_ops = {
- .read = virtio_pci_isr_read,
- .write = virtio_pci_isr_write,
- .impl = {
- .min_access_size = 1,
- .max_access_size = 4,
- },
- .endianness = DEVICE_LITTLE_ENDIAN,
- };
-
- static const MemoryRegionOps device_ops = {
- .read = virtio_pci_device_read,
- .write = virtio_pci_device_write,
- .impl = {
- .min_access_size = 1,
- .max_access_size = 4,
- },
- .endianness = DEVICE_LITTLE_ENDIAN,
- };
-
- static const MemoryRegionOps notify_ops = {
- .read = virtio_pci_notify_read,
- .write = virtio_pci_notify_write,
- .impl = {
- .min_access_size = 1,
- .max_access_size = 4,
- },
- .endianness = DEVICE_LITTLE_ENDIAN,
- };
-
/* TODO: add io access for speed */
virtio_pci_add_mem_cap(proxy, &common);
virtio_pci_add_mem_cap(proxy, &isr);
@@ -1333,28 +1351,11 @@ 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.mr, OBJECT(proxy),
- &common_ops,
- proxy,
- "virtio-pci-common", 0x1000);
+ virtio_pci_modern_regions_init(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.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.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.mr);
pci_register_bar(&proxy->pci_dev, modern_mem_bar,
--
1.8.3.1
- [Qemu-devel] [PATCH 20/33] virtio-pci: make modern bar 64bit + prefetchable, (continued)
- [Qemu-devel] [PATCH 20/33] virtio-pci: make modern bar 64bit + prefetchable, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 27/33] virtio-pci: move virtio_pci_add_mem_cap call to virtio_pci_modern_region_map, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 12/33] linux-headers: add virtio_pci, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 13/33] virtio-pci: initial virtio 1.0 support, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 18/33] virtio-pci: make QEMU_VIRTIO_PCI_QUEUE_MEM_MULT smaller, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 28/33] virtio-pci: move cap type to VirtIOPCIRegion, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 33/33] virtio-input: emulated devices [pci], Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 30/33] virtio-pci: fill VirtIOPCIRegions early., Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 32/33] virtio-input: core code & base class [pci], Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 31/33] pci: add PCI_CLASS_INPUT_*, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 25/33] virtio-pci: add virtio_pci_modern_regions_init(),
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 24/33] virtio-pci: add struct VirtIOPCIRegion for virtio-1 regions, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 04/33] dataplane: allow virtio-1 devices, Gerd Hoffmann, 2015/06/04
- Re: [Qemu-devel] [PATCH 00/33] virtio 1.0 patch series rebased, Michael S. Tsirkin, 2015/06/04
- Re: [Qemu-devel] [PATCH 00/33] virtio 1.0 patch series rebased, Gerd Hoffmann, 2015/06/09
- Re: [Qemu-devel] [PATCH 00/33] virtio 1.0 patch series rebased, Michael S. Tsirkin, 2015/06/10