From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0SUI-0001lV-3J for qemu-devel@nongnu.org; Thu, 04 Jun 2015 06:35:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0SUD-0006lx-5l for qemu-devel@nongnu.org; Thu, 04 Jun 2015 06:35:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60518) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0SUC-0006l7-Uy for qemu-devel@nongnu.org; Thu, 04 Jun 2015 06:34:57 -0400 From: Gerd Hoffmann Date: Thu, 4 Jun 2015 12:34:35 +0200 Message-Id: <1433414083-9720-27-git-send-email-kraxel@redhat.com> In-Reply-To: <1433414083-9720-1-git-send-email-kraxel@redhat.com> References: <1433414083-9720-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 26/33] virtio-pci: add virtio_pci_modern_region_map() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , Gerd Hoffmann , "Michael S. Tsirkin" Add function to map modern virtio regions. Add offset to VirtIOPCIRegion. Signed-off-by: Gerd Hoffmann --- hw/virtio/virtio-pci.c | 25 +++++++++++++++++++------ hw/virtio/virtio-pci.h | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index fad8b80..b99d9fd 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1244,20 +1244,35 @@ static void virtio_pci_modern_regions_init(VirtIOPCIProxy *proxy) &common_ops, proxy, "virtio-pci-common", 0x1000); + proxy->common.offset = 0x0; + memory_region_init_io(&proxy->isr.mr, OBJECT(proxy), &isr_ops, proxy, "virtio-pci-isr", 0x1000); + proxy->isr.offset = 0x1000; + memory_region_init_io(&proxy->device.mr, OBJECT(proxy), &device_ops, virtio_bus_get_device(&proxy->bus), "virtio-pci-device", 0x1000); + proxy->device.offset = 0x2000; + 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); + proxy->notify.offset = 0x3000; +} + +static void virtio_pci_modern_region_map(VirtIOPCIProxy *proxy, + VirtIOPCIRegion *region) +{ + memory_region_add_subregion(&proxy->modern_bar, + region->offset, + ®ion->mr); } /* This is called by virtio-bus just after the device is plugged. */ @@ -1352,12 +1367,10 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) 2 * QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * VIRTIO_QUEUE_MAX); virtio_pci_modern_regions_init(proxy); - memory_region_add_subregion(&proxy->modern_bar, 0, &proxy->common.mr); - memory_region_add_subregion(&proxy->modern_bar, 0x1000, &proxy->isr.mr); - memory_region_add_subregion(&proxy->modern_bar, 0x2000, - &proxy->device.mr); - memory_region_add_subregion(&proxy->modern_bar, 0x3000, - &proxy->notify.mr); + virtio_pci_modern_region_map(proxy, &proxy->common); + virtio_pci_modern_region_map(proxy, &proxy->isr); + virtio_pci_modern_region_map(proxy, &proxy->device); + virtio_pci_modern_region_map(proxy, &proxy->notify); 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 8f1fc02..f5829b0 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -93,6 +93,7 @@ typedef struct VirtioPCIClass { typedef struct VirtIOPCIRegion { MemoryRegion mr; + uint32_t offset; } VirtIOPCIRegion; struct VirtIOPCIProxy { -- 1.8.3.1