Re: [PATCH v2 1/7] libqos: extract Legacy virtio-pci.c code

[Sergio Lopez]

Stefan Hajnoczi <address@hidden> writes:

> The current libqos virtio-pci.c code implements the VIRTIO Legacy
> interface.  Extract existing code in preparation for VIRTIO 1.0 support.
>
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> ---
>  tests/libqos/virtio-pci.h |  2 --
>  tests/libqos/virtio-pci.c | 25 ++++++++++---------------
>  2 files changed, 10 insertions(+), 17 deletions(-)
>
> diff --git a/tests/libqos/virtio-pci.h b/tests/libqos/virtio-pci.h
> index 728b4715f1..0d105d67b3 100644
> --- a/tests/libqos/virtio-pci.h
> +++ b/tests/libqos/virtio-pci.h
> @@ -31,8 +31,6 @@ typedef struct QVirtQueuePCI {
>      uint32_t msix_data;
>  } QVirtQueuePCI;
>  
> -extern const QVirtioBus qvirtio_pci;
> -
>  void virtio_pci_init(QVirtioPCIDevice *dev, QPCIBus *bus, QPCIAddress * 
> addr);
>  QVirtioPCIDevice *virtio_pci_new(QPCIBus *bus, QPCIAddress * addr);
>  
> diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c
> index 50499e75ef..c8d736f4d1 100644
> --- a/tests/libqos/virtio-pci.c
> +++ b/tests/libqos/virtio-pci.c
> @@ -35,14 +35,6 @@
>   * original qvirtio_pci_destructor and qvirtio_pci_start_hw.
>   */
>  
> -static inline bool qvirtio_pci_is_big_endian(QVirtioPCIDevice *dev)
> -{
> -    QPCIBus *bus = dev->pdev->bus;
> -
> -    /* FIXME: virtio 1.0 is always little-endian */
> -    return qtest_big_endian(bus->qts);
> -}
> -
>  #define CONFIG_BASE(dev) (VIRTIO_PCI_CONFIG_OFF((dev)->pdev->msix_enabled))
>  
>  static uint8_t qvirtio_pci_config_readb(QVirtioDevice *d, uint64_t off)
> @@ -55,8 +47,7 @@ static uint8_t qvirtio_pci_config_readb(QVirtioDevice *d, 
> uint64_t off)
>   * but virtio ( < 1.0) is in guest order
>   * so with a big-endian guest the order has been reversed,
>   * reverse it again
> - * virtio-1.0 is always little-endian, like PCI, but this
> - * case will be managed inside qvirtio_pci_is_big_endian()
> + * virtio-1.0 is always little-endian, like PCI
>   */
>  
>  static uint16_t qvirtio_pci_config_readw(QVirtioDevice *d, uint64_t off)
> @@ -258,7 +249,7 @@ static void qvirtio_pci_virtqueue_kick(QVirtioDevice *d, 
> QVirtQueue *vq)
>      qpci_io_writew(dev->pdev, dev->bar, VIRTIO_PCI_QUEUE_NOTIFY, vq->index);
>  }
>  
> -const QVirtioBus qvirtio_pci = {
> +static const QVirtioBus qvirtio_pci_legacy = {
>      .config_readb = qvirtio_pci_config_readb,
>      .config_readw = qvirtio_pci_config_readw,
>      .config_readl = qvirtio_pci_config_readl,
> @@ -374,15 +365,19 @@ void qvirtio_pci_start_hw(QOSGraphObject *obj)
>      qvirtio_start_device(&dev->vdev);
>  }
>  
> +static void qvirtio_pci_init_legacy(QVirtioPCIDevice *dev)
> +{
> +    dev->vdev.device_type = qpci_config_readw(dev->pdev, PCI_SUBSYSTEM_ID);
> +    dev->vdev.bus = &qvirtio_pci_legacy;
> +    dev->vdev.big_endian = qtest_big_endian(dev->pdev->bus->qts);
> +}
> +
>  static void qvirtio_pci_init_from_pcidev(QVirtioPCIDevice *dev, QPCIDevice 
> *pci_dev)
>  {
>      dev->pdev = pci_dev;
> -    dev->vdev.device_type = qpci_config_readw(pci_dev, PCI_SUBSYSTEM_ID);
> -
>      dev->config_msix_entry = -1;
>  
> -    dev->vdev.bus = &qvirtio_pci;
> -    dev->vdev.big_endian = qvirtio_pci_is_big_endian(dev);
> +    qvirtio_pci_init_legacy(dev);
>  
>      /* each virtio-xxx-pci device should override at least this function */
>      dev->obj.get_driver = NULL;

Reviewed-by: Sergio Lopez <address@hidden>

signature.asc
Description: PGP signature