[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 14/16] libqos: make the virtio-pci BAR index configurable
From: |
Stefan Hajnoczi |
Subject: |
[PATCH v4 14/16] libqos: make the virtio-pci BAR index configurable |
Date: |
Wed, 23 Oct 2019 11:04:23 +0100 |
The Legacy virtio-pci interface always uses BAR 0. VIRTIO 1.0 may need
to use a different BAR index, so make it configurable.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
v3:
* Change uint8_t bar_idx to int [Thomas]
---
tests/libqos/virtio-pci.h | 2 ++
tests/libqos/virtio-pci.c | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/libqos/virtio-pci.h b/tests/libqos/virtio-pci.h
index 0e4a8b7b00..78a1c15c2a 100644
--- a/tests/libqos/virtio-pci.h
+++ b/tests/libqos/virtio-pci.h
@@ -25,6 +25,8 @@ typedef struct QVirtioPCIDevice {
uint16_t config_msix_entry;
uint64_t config_msix_addr;
uint32_t config_msix_data;
+
+ int bar_idx;
} QVirtioPCIDevice;
struct QVirtioPCIMSIXOps {
diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c
index c900742f96..e9595603f5 100644
--- a/tests/libqos/virtio-pci.c
+++ b/tests/libqos/virtio-pci.c
@@ -310,7 +310,7 @@ static const QVirtioPCIMSIXOps qvirtio_pci_msix_ops_legacy
= {
void qvirtio_pci_device_enable(QVirtioPCIDevice *d)
{
qpci_device_enable(d->pdev);
- d->bar = qpci_iomap(d->pdev, 0, NULL);
+ d->bar = qpci_iomap(d->pdev, d->bar_idx, NULL);
}
void qvirtio_pci_device_disable(QVirtioPCIDevice *d)
@@ -400,6 +400,7 @@ static void qvirtio_pci_init_from_pcidev(QVirtioPCIDevice
*dev, QPCIDevice *pci_
{
dev->pdev = pci_dev;
dev->vdev.device_type = qpci_config_readw(pci_dev, PCI_SUBSYSTEM_ID);
+ dev->bar_idx = 0;
dev->config_msix_entry = -1;
dev->msix_ops = &qvirtio_pci_msix_ops_legacy;
--
2.21.0
- Re: [PATCH v4 06/16] libqos: add missing virtio-9p feature negotiation, (continued)
- [PATCH v4 07/16] libqos: enforce Device Initialization order, Stefan Hajnoczi, 2019/10/23
- [PATCH v4 08/16] libqos: implement VIRTIO 1.0 FEATURES_OK step, Stefan Hajnoczi, 2019/10/23
- [PATCH v4 10/16] libqos: add iteration support to qpci_find_capability(), Stefan Hajnoczi, 2019/10/23
- [PATCH v4 09/16] libqos: access VIRTIO 1.0 vring in little-endian, Stefan Hajnoczi, 2019/10/23
- [PATCH v4 11/16] libqos: pass full QVirtQueue to set_queue_address(), Stefan Hajnoczi, 2019/10/23
- [PATCH v4 12/16] libqos: add MSI-X callbacks to QVirtioPCIDevice, Stefan Hajnoczi, 2019/10/23
- [PATCH v4 13/16] libqos: expose common virtqueue setup/cleanup functions, Stefan Hajnoczi, 2019/10/23
- [PATCH v4 14/16] libqos: make the virtio-pci BAR index configurable,
Stefan Hajnoczi <=
- [PATCH v4 15/16] libqos: extract Legacy virtio-pci.c code, Stefan Hajnoczi, 2019/10/23
- [PATCH v4 16/16] libqos: add VIRTIO PCI 1.0 support, Stefan Hajnoczi, 2019/10/23
- Re: [PATCH v4 00/16] libqos: add VIRTIO PCI 1.0 support, Michael S. Tsirkin, 2019/10/25