From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgY6h-0001Yb-8f for qemu-devel@nongnu.org; Fri, 10 Apr 2015 08:32:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgY6f-000162-Vs for qemu-devel@nongnu.org; Fri, 10 Apr 2015 08:32:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgY6f-000151-Og for qemu-devel@nongnu.org; Fri, 10 Apr 2015 08:32:21 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3ACWKo4009950 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 10 Apr 2015 08:32:20 -0400 From: Gerd Hoffmann Date: Fri, 10 Apr 2015 14:31:43 +0200 Message-Id: <1428669111-24225-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1428669111-24225-1-git-send-email-kraxel@redhat.com> References: <1428669111-24225-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/9] virtio: add struct VirtIOPCIRegion for virtio-1 regions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , mst@redhat.com For now just place the MemoryRegion there, following patches will add more. Signed-off-by: Gerd Hoffmann --- hw/virtio/virtio-pci.c | 18 ++++++++++-------- hw/virtio/virtio-pci.h | 12 ++++++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 4c653fe..9c84f5a 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1307,28 +1307,30 @@ static void virtio_pci_device_plugged(DeviceState *d) memory_region_init(&proxy->modern_bar, OBJECT(proxy), "virtio-pci", 2 * QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * VIRTIO_PCI_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_PCI_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 efe8d31..6c717cf 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -93,13 +93,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; -- 1.8.3.1