diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2019-10-23 11:04:23 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-10-25 07:46:22 -0400 |
| commit | f17429e545dae46fbe85eebd89fec4e720a1e241 (patch) | |
| tree | a7a0205403e5785b83eee1925c319f2a789b7d70 /tests | |
| parent | e56536bc8b897efdf069c25e68202e521cdcbb49 (diff) | |
| download | qemu-f17429e545dae46fbe85eebd89fec4e720a1e241.zip qemu-f17429e545dae46fbe85eebd89fec4e720a1e241.tar.gz qemu-f17429e545dae46fbe85eebd89fec4e720a1e241.tar.bz2 | |
libqos: make the virtio-pci BAR index configurable
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 <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191023100425.12168-15-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libqos/virtio-pci.c | 3 | ||||
| -rw-r--r-- | tests/libqos/virtio-pci.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c index c900742..e959560 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; diff --git a/tests/libqos/virtio-pci.h b/tests/libqos/virtio-pci.h index 0e4a8b7..78a1c15 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 { |