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>
This commit is contained in:
Stefan Hajnoczi 2019-10-23 11:04:23 +01:00 committed by Michael S. Tsirkin
parent e56536bc8b
commit f17429e545
2 changed files with 4 additions and 1 deletions

View File

@ -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;

View File

@ -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 {