[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/9] virtio: move cap type to VirtIOPCIRegion
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 5/9] virtio: move cap type to VirtIOPCIRegion |
Date: |
Fri, 10 Apr 2015 14:31:47 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/virtio/virtio-pci.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 617a3b7..037f4ea 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1221,18 +1221,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,
@@ -1241,6 +1244,7 @@ static void virtio_pci_modern_regions_init(VirtIOPCIProxy
*proxy)
QEMU_VIRTIO_PCI_QUEUE_MEM_MULT *
VIRTIO_PCI_QUEUE_MAX);
proxy->notify.offset = 0x3000;
+ proxy->notify.type = VIRTIO_PCI_CAP_NOTIFY_CFG;
}
static void virtio_pci_modern_region_map(VirtIOPCIProxy *proxy,
@@ -1251,6 +1255,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);
@@ -1305,22 +1310,18 @@ static void virtio_pci_device_plugged(DeviceState *d)
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 =
cpu_to_le32(QEMU_VIRTIO_PCI_QUEUE_MEM_MULT),
--
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 <=
- [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, 2015/04/10
- Re: [Qemu-devel] [PATCH 0/9] virtio-1.0: cleanups and preparations for virtio-vga, Gerd Hoffmann, 2015/04/27