From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgY6h-0001a4-Ut 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 1YgY6g-00016m-Gd for qemu-devel@nongnu.org; Fri, 10 Apr 2015 08:32:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgY6g-00015g-7Y 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 t3ACWLlw019161 (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:48 +0200 Message-Id: <1428669111-24225-7-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 6/9] virtio: drop identical virtio_pci_cap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , mst@redhat.com Now the three struct virtio_pci_caps are identical, lets drop two of them ;) Signed-off-by: Gerd Hoffmann --- hw/virtio/virtio-pci.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 037f4ea..229f93d 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1309,16 +1309,8 @@ static void virtio_pci_device_plugged(DeviceState *d) if (modern) { - struct virtio_pci_cap common = { - .cap_len = sizeof common, - .bar = modern_mem_bar, - }; - struct virtio_pci_cap isr = { - .cap_len = sizeof isr, - .bar = modern_mem_bar, - }; - struct virtio_pci_cap device = { - .cap_len = sizeof device, + struct virtio_pci_cap cap = { + .cap_len = sizeof cap, .bar = modern_mem_bar, }; struct virtio_pci_notify_cap notify = { @@ -1334,9 +1326,9 @@ static void virtio_pci_device_plugged(DeviceState *d) 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, &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->common, &cap); + virtio_pci_modern_region_map(proxy, &proxy->isr, &cap); + virtio_pci_modern_region_map(proxy, &proxy->device, &cap); virtio_pci_modern_region_map(proxy, &proxy->notify, ¬ify.cap); pci_register_bar(&proxy->pci_dev, modern_mem_bar, PCI_BASE_ADDRESS_SPACE_MEMORY | -- 1.8.3.1