On 10/19/19 8:38 AM, Stefan Hajnoczi wrote:
> 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>
> ---
> 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;
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>