OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio-pci: drop identical virtio_pci_cap 

Now the three struct virtio_pci_caps are identical,
lets drop two of them ;)

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Gerd Hoffmann 2015-06-04 12:34:38 +02:00 committed by Michael S. Tsirkin
parent fc004905c5
commit cc52ea90f8
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/virtio/virtio-pci.c
View File

@ -1341,16 +1341,8 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
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 = {
@ -1367,9 +1359,9 @@ 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);
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, &notify.cap);
pci_register_bar(&proxy->pci_dev, modern_mem_bar,
PCI_BASE_ADDRESS_SPACE_MEMORY |