[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/9] virtio: drop identical virtio_pci_cap
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 6/9] virtio: drop identical virtio_pci_cap |
Date: |
Fri, 10 Apr 2015 14:31:48 +0200 |
Now the three struct virtio_pci_caps are identical,
lets drop two of them ;)
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/9] virtio-1.0: cleanups and preparations for virtio-vga, Gerd Hoffmann, 2015/04/10
- [Qemu-devel] [PATCH 1/9] virtio: add struct VirtIOPCIRegion for virtio-1 regions, Gerd Hoffmann, 2015/04/10
- [Qemu-devel] [PATCH 5/9] virtio: move cap type to VirtIOPCIRegion, Gerd Hoffmann, 2015/04/10
- [Qemu-devel] [PATCH 3/9] virtio: add virtio_pci_modern_region_map(), Gerd Hoffmann, 2015/04/10
- [Qemu-devel] [PATCH 8/9] virtio: init from virtio_pci_device_plugged to virtio_pci_realize, Gerd Hoffmann, 2015/04/10
- [Qemu-devel] [PATCH 6/9] virtio: drop identical virtio_pci_cap,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 4/9] virtio: move virtio_pci_add_mem_cap call to virtio_pci_modern_region_map, Gerd Hoffmann, 2015/04/10
- [Qemu-devel] [PATCH 9/9] virtio-vga: make compatible with stdvga, Gerd Hoffmann, 2015/04/10
- [Qemu-devel] [PATCH 2/9] virtio: add virtio_pci_modern_regions_init(), Gerd Hoffmann, 2015/04/10
- [Qemu-devel] [PATCH 7/9] virtio: move bar assignments to VirtIOPCIProxy, Gerd Hoffmann, 2015/04/10
- Re: [Qemu-devel] [PATCH 0/9] virtio-1.0: cleanups and preparations for virtio-vga, Gerd Hoffmann, 2015/04/27