[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/26] virtio: rename the bar index field name in Vir
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 25/26] virtio: rename the bar index field name in VirtIOPCIProxy |
Date: |
Sat, 8 Oct 2016 11:58:11 +0300 |
From: Chen Fan <address@hidden>
the bar index names are much similar to the bar memory regions,
distinguish them to improve the code readability.
Signed-off-by: Chen Fan <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/display/virtio-vga.c | 4 ++--
hw/virtio/virtio-pci.c | 20 ++++++++++----------
hw/virtio/virtio-pci.h | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index f77b401..f9b017d 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -120,8 +120,8 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev,
Error **errp)
* virtio regions are moved to the end of bar #2, to make room for
* the stdvga mmio registers at the start of bar #2.
*/
- vpci_dev->modern_mem_bar = 2;
- vpci_dev->msix_bar = 4;
+ vpci_dev->modern_mem_bar_idx = 2;
+ vpci_dev->msix_bar_idx = 4;
if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) {
/*
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 2d60a00..06831de 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1551,7 +1551,7 @@ static void
virtio_pci_modern_mem_region_map(VirtIOPCIProxy *proxy,
struct virtio_pci_cap *cap)
{
virtio_pci_modern_region_map(proxy, region, cap,
- &proxy->modern_bar, proxy->modern_mem_bar);
+ &proxy->modern_bar,
proxy->modern_mem_bar_idx);
}
static void virtio_pci_modern_io_region_map(VirtIOPCIProxy *proxy,
@@ -1559,7 +1559,7 @@ static void
virtio_pci_modern_io_region_map(VirtIOPCIProxy *proxy,
struct virtio_pci_cap *cap)
{
virtio_pci_modern_region_map(proxy, region, cap,
- &proxy->io_bar, proxy->modern_io_bar);
+ &proxy->io_bar, proxy->modern_io_bar_idx);
}
static void virtio_pci_modern_mem_region_unmap(VirtIOPCIProxy *proxy,
@@ -1670,14 +1670,14 @@ static void virtio_pci_device_plugged(DeviceState *d,
Error **errp)
memory_region_init(&proxy->io_bar, OBJECT(proxy),
"virtio-pci-io", 0x4);
- pci_register_bar(&proxy->pci_dev, proxy->modern_io_bar,
+ pci_register_bar(&proxy->pci_dev, proxy->modern_io_bar_idx,
PCI_BASE_ADDRESS_SPACE_IO, &proxy->io_bar);
virtio_pci_modern_io_region_map(proxy, &proxy->notify_pio,
¬ify_pio.cap);
}
- pci_register_bar(&proxy->pci_dev, proxy->modern_mem_bar,
+ pci_register_bar(&proxy->pci_dev, proxy->modern_mem_bar_idx,
PCI_BASE_ADDRESS_SPACE_MEMORY |
PCI_BASE_ADDRESS_MEM_PREFETCH |
PCI_BASE_ADDRESS_MEM_TYPE_64,
@@ -1693,7 +1693,7 @@ static void virtio_pci_device_plugged(DeviceState *d,
Error **errp)
if (proxy->nvectors) {
int err = msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors,
- proxy->msix_bar);
+ proxy->msix_bar_idx);
if (err) {
/* Notice when a system that supports MSIx can't initialize it. */
if (err != -ENOTSUP) {
@@ -1716,7 +1716,7 @@ static void virtio_pci_device_plugged(DeviceState *d,
Error **errp)
&virtio_pci_config_ops,
proxy, "virtio-pci", size);
- pci_register_bar(&proxy->pci_dev, proxy->legacy_io_bar,
+ pci_register_bar(&proxy->pci_dev, proxy->legacy_io_bar_idx,
PCI_BASE_ADDRESS_SPACE_IO, &proxy->bar);
}
@@ -1760,10 +1760,10 @@ static void virtio_pci_realize(PCIDevice *pci_dev,
Error **errp)
* region 4+5 -- virtio modern memory (64bit) bar
*
*/
- proxy->legacy_io_bar = 0;
- proxy->msix_bar = 1;
- proxy->modern_io_bar = 2;
- proxy->modern_mem_bar = 4;
+ proxy->legacy_io_bar_idx = 0;
+ proxy->msix_bar_idx = 1;
+ proxy->modern_io_bar_idx = 2;
+ proxy->modern_mem_bar_idx = 4;
proxy->common.offset = 0x0;
proxy->common.size = 0x1000;
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index 541cbdb..b4edea6 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -143,10 +143,10 @@ struct VirtIOPCIProxy {
MemoryRegion io_bar;
MemoryRegion modern_cfg;
AddressSpace modern_as;
- uint32_t legacy_io_bar;
- uint32_t msix_bar;
- uint32_t modern_io_bar;
- uint32_t modern_mem_bar;
+ uint32_t legacy_io_bar_idx;
+ uint32_t msix_bar_idx;
+ uint32_t modern_io_bar_idx;
+ uint32_t modern_mem_bar_idx;
int config_cap;
uint32_t flags;
bool disable_modern;
--
2.1.4
- [Qemu-devel] [PULL 22/26] CODING_STYLE: Fix a typo ("have" vs. "has"), (continued)
- [Qemu-devel] [PULL 22/26] CODING_STYLE: Fix a typo ("have" vs. "has"), Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 05/26] MAINTAINERS: Add some more files to the HMP section, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 02/26] bt-hci-csr: drop unused argument, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 07/26] MAINTAINERS: Add some SPARC machine related files, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 20/26] build-sys: fix find-in-path, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 12/26] MAINTAINERS: Add usermode related config files, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 04/26] MAINTAINERS: Add files to the Moxie section., Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 06/26] MAINTAINERS: Add include/hw/audio/ to audio section, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 15/26] maint: Add module_block.h to .gitignore, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 18/26] exec: remove unused compacted argument, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 25/26] virtio: rename the bar index field name in VirtIOPCIProxy,
Michael Tokarev <=
- [Qemu-devel] [PULL 24/26] linux-user: include <poll.h> instead of <sys/poll.h>, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 08/26] MAINTAINERS: Add some more files to the virtio section, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 01/26] qemu-options.hx: fix -chardev ringbuf typos, Michael Tokarev, 2016/10/08
- Re: [Qemu-devel] [PULL 00/26] Trivial patches for 2016-10-08, Peter Maydell, 2016/10/10