Commit 1e59a866 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Michael S. Tsirkin
Browse files

libqos: pass full QVirtQueue to set_queue_address() 



Instead of just passing the vring page frame number, pass the full
QVirtQueue.  This will allow the VIRTIO 1.0 transport to program the
fine-grained vring address registers in the future.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarSergio Lopez <slp@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191023100425.12168-12-stefanha@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent a32a028a

tests/libqos/virtio-mmio.c

+4 −2
Original line number Diff line number Diff line
@@ -143,9 +143,11 @@ static uint16_t qvirtio_mmio_get_queue_size(QVirtioDevice *d) 
    return (uint16_t)qtest_readl(dev->qts, dev->addr + QVIRTIO_MMIO_QUEUE_NUM_MAX);

}



static void qvirtio_mmio_set_queue_address(QVirtioDevice *d, uint32_t pfn)

static void qvirtio_mmio_set_queue_address(QVirtioDevice *d, QVirtQueue *vq)

{

    QVirtioMMIODevice *dev = container_of(d, QVirtioMMIODevice, vdev);

    uint64_t pfn = vq->desc / dev->page_size;



    qtest_writel(dev->qts, dev->addr + QVIRTIO_MMIO_QUEUE_PFN, pfn);

}
@@ -179,7 +181,7 @@ static QVirtQueue *qvirtio_mmio_virtqueue_setup(QVirtioDevice *d, 


    addr = guest_alloc(alloc, qvring_size(vq->size, dev->page_size));

    qvring_init(dev->qts, alloc, vq, addr);

    qvirtio_mmio_set_queue_address(d, vq->desc / dev->page_size);

    qvirtio_mmio_set_queue_address(d, vq);



    return vq;

}

tests/libqos/virtio-pci.c

+4 −2
Original line number Diff line number Diff line
@@ -199,9 +199,11 @@ static uint16_t qvirtio_pci_get_queue_size(QVirtioDevice *d) 
    return qpci_io_readw(dev->pdev, dev->bar, VIRTIO_PCI_QUEUE_NUM);

}



static void qvirtio_pci_set_queue_address(QVirtioDevice *d, uint32_t pfn)

static void qvirtio_pci_set_queue_address(QVirtioDevice *d, QVirtQueue *vq)

{

    QVirtioPCIDevice *dev = container_of(d, QVirtioPCIDevice, vdev);

    uint64_t pfn = vq->desc / VIRTIO_PCI_VRING_ALIGN;



    qpci_io_writel(dev->pdev, dev->bar, VIRTIO_PCI_QUEUE_PFN, pfn);

}
@@ -239,7 +241,7 @@ static QVirtQueue *qvirtio_pci_virtqueue_setup(QVirtioDevice *d, 
    addr = guest_alloc(alloc, qvring_size(vqpci->vq.size,

                                          VIRTIO_PCI_VRING_ALIGN));

    qvring_init(qvpcidev->pdev->bus->qts, alloc, &vqpci->vq, addr);

    qvirtio_pci_set_queue_address(d, vqpci->vq.desc / VIRTIO_PCI_VRING_ALIGN);

    qvirtio_pci_set_queue_address(d, &vqpci->vq);



    return &vqpci->vq;

}

tests/libqos/virtio.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct QVirtioBus { 
    uint16_t (*get_queue_size)(QVirtioDevice *d);



    /* Set the address of the selected queue */

    void (*set_queue_address)(QVirtioDevice *d, uint32_t pfn);

    void (*set_queue_address)(QVirtioDevice *d, QVirtQueue *vq);



    /* Setup the virtqueue specified by index */

    QVirtQueue *(*virtqueue_setup)(QVirtioDevice *d, QGuestAllocator *alloc,