From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgY6i-0001aw-Aj for qemu-devel@nongnu.org; Fri, 10 Apr 2015 08:32:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgY6g-00016y-OZ for qemu-devel@nongnu.org; Fri, 10 Apr 2015 08:32:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgY6g-00015Z-7x for qemu-devel@nongnu.org; Fri, 10 Apr 2015 08:32:22 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3ACWKaq011693 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 10 Apr 2015 08:32:21 -0400 From: Gerd Hoffmann Date: Fri, 10 Apr 2015 14:31:46 +0200 Message-Id: <1428669111-24225-5-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 4/9] virtio: move virtio_pci_add_mem_cap call to virtio_pci_modern_region_map List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , mst@redhat.com Also fill offset and length automatically, from VirtIOPCIRegion->offset and region size. Signed-off-by: Gerd Hoffmann --- hw/virtio/virtio-pci.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 44386cd..617a3b7 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1244,11 +1244,16 @@ static void virtio_pci_modern_regions_init(VirtIOPCIProxy *proxy) } static void virtio_pci_modern_region_map(VirtIOPCIProxy *proxy, - VirtIOPCIRegion *region) + VirtIOPCIRegion *region, + struct virtio_pci_cap *cap) { memory_region_add_subregion(&proxy->modern_bar, region->offset, ®ion->mr); + + cap->offset = cpu_to_le32(region->offset); + cap->length = cpu_to_le32(memory_region_size(®ion->mr)); + virtio_pci_add_mem_cap(proxy, cap); } /* This is called by virtio-bus just after the device is plugged. */ @@ -1303,48 +1308,35 @@ static void virtio_pci_device_plugged(DeviceState *d) .cfg_type = VIRTIO_PCI_CAP_COMMON_CFG, .cap_len = sizeof common, .bar = modern_mem_bar, - .offset = cpu_to_le32(0x0), - .length = cpu_to_le32(0x1000), }; struct virtio_pci_cap isr = { .cfg_type = VIRTIO_PCI_CAP_ISR_CFG, .cap_len = sizeof isr, .bar = modern_mem_bar, - .offset = cpu_to_le32(0x1000), - .length = cpu_to_le32(0x1000), }; struct virtio_pci_cap device = { .cfg_type = VIRTIO_PCI_CAP_DEVICE_CFG, .cap_len = sizeof device, .bar = modern_mem_bar, - .offset = cpu_to_le32(0x2000), - .length = cpu_to_le32(0x1000), }; struct virtio_pci_notify_cap notify = { .cap.cfg_type = VIRTIO_PCI_CAP_NOTIFY_CFG, .cap.cap_len = sizeof notify, .cap.bar = modern_mem_bar, - .cap.offset = cpu_to_le32(0x3000), - .cap.length = cpu_to_le32(QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * - VIRTIO_PCI_QUEUE_MAX), .notify_off_multiplier = cpu_to_le32(QEMU_VIRTIO_PCI_QUEUE_MEM_MULT), }; /* TODO: add io access for speed */ - virtio_pci_add_mem_cap(proxy, &common); - virtio_pci_add_mem_cap(proxy, &isr); - virtio_pci_add_mem_cap(proxy, &device); - virtio_pci_add_mem_cap(proxy, ¬ify.cap); virtio_add_feature(&proxy->host_features, VIRTIO_F_VERSION_1); memory_region_init(&proxy->modern_bar, OBJECT(proxy), "virtio-pci", 2 * QEMU_VIRTIO_PCI_QUEUE_MEM_MULT * VIRTIO_PCI_QUEUE_MAX); virtio_pci_modern_regions_init(proxy); - 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); + virtio_pci_modern_region_map(proxy, &proxy->common, &common); + virtio_pci_modern_region_map(proxy, &proxy->isr, &isr); + virtio_pci_modern_region_map(proxy, &proxy->device, &device); + virtio_pci_modern_region_map(proxy, &proxy->notify, ¬ify.cap); pci_register_bar(&proxy->pci_dev, modern_mem_bar, PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_PREFETCH | -- 1.8.3.1