[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/33] virtio-pci: move cap type to VirtIOPCIRegion
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 28/33] virtio-pci: move cap type to VirtIOPCIRegion |
Date: |
Thu, 4 Jun 2015 12:34:37 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/virtio/virtio-pci.c | 9 +++++----
hw/virtio/virtio-pci.h | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 4481294..7cffe8a 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1245,18 +1245,21 @@ static void
virtio_pci_modern_regions_init(VirtIOPCIProxy *proxy)
proxy,
"virtio-pci-common", 0x1000);
proxy->common.offset = 0x0;
+ proxy->common.type = VIRTIO_PCI_CAP_COMMON_CFG;
memory_region_init_io(&proxy->isr.mr, OBJECT(proxy),
&isr_ops,
proxy,
"virtio-pci-isr", 0x1000);
proxy->isr.offset = 0x1000;
+ proxy->isr.type = VIRTIO_PCI_CAP_ISR_CFG;
memory_region_init_io(&proxy->device.mr, OBJECT(proxy),
&device_ops,
virtio_bus_get_device(&proxy->bus),
"virtio-pci-device", 0x1000);
proxy->device.offset = 0x2000;
+ proxy->device.type = VIRTIO_PCI_CAP_DEVICE_CFG;
memory_region_init_io(&proxy->notify.mr, OBJECT(proxy),
¬ify_ops,
@@ -1265,6 +1268,7 @@ static void virtio_pci_modern_regions_init(VirtIOPCIProxy
*proxy)
QEMU_VIRTIO_PCI_QUEUE_MEM_MULT *
VIRTIO_QUEUE_MAX);
proxy->notify.offset = 0x3000;
+ proxy->notify.type = VIRTIO_PCI_CAP_NOTIFY_CFG;
}
static void virtio_pci_modern_region_map(VirtIOPCIProxy *proxy,
@@ -1275,6 +1279,7 @@ static void virtio_pci_modern_region_map(VirtIOPCIProxy
*proxy,
region->offset,
®ion->mr);
+ cap->cfg_type = region->type;
cap->offset = cpu_to_le32(region->offset);
cap->length = cpu_to_le32(memory_region_size(®ion->mr));
virtio_pci_add_mem_cap(proxy, cap);
@@ -1330,22 +1335,18 @@ static void virtio_pci_device_plugged(DeviceState *d,
Error **errp)
if (modern) {
struct virtio_pci_cap common = {
- .cfg_type = VIRTIO_PCI_CAP_COMMON_CFG,
.cap_len = sizeof common,
.bar = modern_mem_bar,
};
struct virtio_pci_cap isr = {
- .cfg_type = VIRTIO_PCI_CAP_ISR_CFG,
.cap_len = sizeof isr,
.bar = modern_mem_bar,
};
struct virtio_pci_cap device = {
- .cfg_type = VIRTIO_PCI_CAP_DEVICE_CFG,
.cap_len = sizeof device,
.bar = modern_mem_bar,
};
struct virtio_pci_notify_cap notify = {
- .cap.cfg_type = VIRTIO_PCI_CAP_NOTIFY_CFG,
.cap.cap_len = sizeof notify,
.cap.bar = modern_mem_bar,
.notify_off_multiplier =
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index f5829b0..ea1343d 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -94,6 +94,7 @@ typedef struct VirtioPCIClass {
typedef struct VirtIOPCIRegion {
MemoryRegion mr;
uint32_t offset;
+ uint32_t type;
} VirtIOPCIRegion;
struct VirtIOPCIProxy {
--
1.8.3.1
- [Qemu-devel] [PATCH 19/33] virtio-pci: change & document virtio pci bar layout., (continued)
- [Qemu-devel] [PATCH 19/33] virtio-pci: change & document virtio pci bar layout., Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 29/33] virtio-pci: drop identical virtio_pci_cap, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 26/33] virtio-pci: add virtio_pci_modern_region_map(), Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 06/33] virtio: allow to fail setting status, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 23/33] virtio-balloon: switch to virtio_add_feature, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 20/33] virtio-pci: make modern bar 64bit + prefetchable, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 27/33] virtio-pci: move virtio_pci_add_mem_cap call to virtio_pci_modern_region_map, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 12/33] linux-headers: add virtio_pci, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 13/33] virtio-pci: initial virtio 1.0 support, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 18/33] virtio-pci: make QEMU_VIRTIO_PCI_QUEUE_MEM_MULT smaller, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 28/33] virtio-pci: move cap type to VirtIOPCIRegion,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 33/33] virtio-input: emulated devices [pci], Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 30/33] virtio-pci: fill VirtIOPCIRegions early., Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 32/33] virtio-input: core code & base class [pci], Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 31/33] pci: add PCI_CLASS_INPUT_*, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 25/33] virtio-pci: add virtio_pci_modern_regions_init(), Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 24/33] virtio-pci: add struct VirtIOPCIRegion for virtio-1 regions, Gerd Hoffmann, 2015/06/04
- [Qemu-devel] [PATCH 04/33] dataplane: allow virtio-1 devices, Gerd Hoffmann, 2015/06/04
- Re: [Qemu-devel] [PATCH 00/33] virtio 1.0 patch series rebased, Michael S. Tsirkin, 2015/06/04