[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9] virtio: move bar assignments to VirtIOPCIProxy
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 7/9] virtio: move bar assignments to VirtIOPCIProxy |
Date: |
Fri, 10 Apr 2015 14:31:49 +0200 |
Add variables for the pci bars, in preparation
to make this configurable.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/virtio/virtio-pci.c | 16 ++++++++--------
hw/virtio/virtio-pci.h | 3 +++
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 229f93d..c6fd73f 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1256,6 +1256,7 @@ static void virtio_pci_modern_region_map(VirtIOPCIProxy
*proxy,
®ion->mr);
cap->cfg_type = region->type;
+ cap->bar = proxy->modern_mem_bar;
cap->offset = cpu_to_le32(region->offset);
cap->length = cpu_to_le32(memory_region_size(®ion->mr));
virtio_pci_add_mem_cap(proxy, cap);
@@ -1283,9 +1284,9 @@ static void virtio_pci_device_plugged(DeviceState *d)
* virtio-vga places the vga framebuffer there.
*
*/
- uint32_t legacy_io_bar = 0;
- uint32_t msix_bar = 1;
- uint32_t modern_mem_bar = 4;
+ proxy->legacy_io_bar = 0;
+ proxy->msix_bar = 1;
+ proxy->modern_mem_bar = 4;
config = proxy->pci_dev.config;
if (proxy->class_code) {
@@ -1311,11 +1312,9 @@ static void virtio_pci_device_plugged(DeviceState *d)
if (modern) {
struct virtio_pci_cap cap = {
.cap_len = sizeof cap,
- .bar = modern_mem_bar,
};
struct virtio_pci_notify_cap notify = {
.cap.cap_len = sizeof notify,
- .cap.bar = modern_mem_bar,
.notify_off_multiplier =
cpu_to_le32(QEMU_VIRTIO_PCI_QUEUE_MEM_MULT),
};
@@ -1330,7 +1329,7 @@ static void virtio_pci_device_plugged(DeviceState *d)
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_register_bar(&proxy->pci_dev, proxy->modern_mem_bar,
PCI_BASE_ADDRESS_SPACE_MEMORY |
PCI_BASE_ADDRESS_MEM_PREFETCH |
PCI_BASE_ADDRESS_MEM_TYPE_64,
@@ -1338,7 +1337,8 @@ static void virtio_pci_device_plugged(DeviceState *d)
}
if (proxy->nvectors &&
- msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors, msix_bar)) {
+ msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors,
+ proxy->msix_bar)) {
error_report("unable to init msix vectors to %" PRIu32,
proxy->nvectors);
proxy->nvectors = 0;
@@ -1357,7 +1357,7 @@ static void virtio_pci_device_plugged(DeviceState *d)
&virtio_pci_config_ops,
proxy, "virtio-pci", size);
- pci_register_bar(&proxy->pci_dev, legacy_io_bar,
+ pci_register_bar(&proxy->pci_dev, proxy->legacy_io_bar,
PCI_BASE_ADDRESS_SPACE_IO, &proxy->bar);
}
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index d1cd924..c62f68b 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -107,6 +107,9 @@ struct VirtIOPCIProxy {
VirtIOPCIRegion device;
VirtIOPCIRegion notify;
MemoryRegion modern_bar;
+ uint32_t legacy_io_bar;
+ uint32_t msix_bar;
+ uint32_t modern_mem_bar;
uint32_t flags;
uint32_t class_code;
uint32_t nvectors;
--
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, 2015/04/10
- [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 <=
- Re: [Qemu-devel] [PATCH 0/9] virtio-1.0: cleanups and preparations for virtio-vga, Gerd Hoffmann, 2015/04/27