From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9WdG-0004cj-FP for qemu-devel@nongnu.org; Fri, 09 Jan 2015 05:17:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9WdA-0000nF-0H for qemu-devel@nongnu.org; Fri, 09 Jan 2015 05:17:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9Wd9-0000ms-Oh for qemu-devel@nongnu.org; Fri, 09 Jan 2015 05:17:23 -0500 From: Stefan Hajnoczi Date: Fri, 9 Jan 2015 10:16:44 +0000 Message-Id: <1420798626-11428-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1420798626-11428-1-git-send-email-stefanha@redhat.com> References: <1420798626-11428-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 04/26] libqos: Remove PCI assumptions in constants of virtio driver List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Peter Maydell , Stefan Hajnoczi From: Marc Mar=C3=AD Convert PCI-specific constants names of libqos virtio driver. Signed-off-by: Marc Mar=C3=AD Signed-off-by: Stefan Hajnoczi --- tests/libqos/virtio-pci.c | 30 +++++++++++++++--------------- tests/libqos/virtio-pci.h | 24 ++++++++++++------------ tests/virtio-blk-test.c | 11 ++++++----- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c index 92bcac1..046a316 100644 --- a/tests/libqos/virtio-pci.c +++ b/tests/libqos/virtio-pci.c @@ -102,31 +102,31 @@ static uint64_t qvirtio_pci_config_readq(QVirtioDev= ice *d, uint64_t addr) static uint32_t qvirtio_pci_get_features(QVirtioDevice *d) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - return qpci_io_readl(dev->pdev, dev->addr + QVIRTIO_DEVICE_FEATURES)= ; + return qpci_io_readl(dev->pdev, dev->addr + QVIRTIO_PCI_DEVICE_FEATU= RES); } =20 static void qvirtio_pci_set_features(QVirtioDevice *d, uint32_t features= ) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - qpci_io_writel(dev->pdev, dev->addr + QVIRTIO_GUEST_FEATURES, featur= es); + qpci_io_writel(dev->pdev, dev->addr + QVIRTIO_PCI_GUEST_FEATURES, fe= atures); } =20 static uint32_t qvirtio_pci_get_guest_features(QVirtioDevice *d) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - return qpci_io_readl(dev->pdev, dev->addr + QVIRTIO_GUEST_FEATURES); + return qpci_io_readl(dev->pdev, dev->addr + QVIRTIO_PCI_GUEST_FEATUR= ES); } =20 static uint8_t qvirtio_pci_get_status(QVirtioDevice *d) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - return qpci_io_readb(dev->pdev, dev->addr + QVIRTIO_DEVICE_STATUS); + return qpci_io_readb(dev->pdev, dev->addr + QVIRTIO_PCI_DEVICE_STATU= S); } =20 static void qvirtio_pci_set_status(QVirtioDevice *d, uint8_t status) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - qpci_io_writeb(dev->pdev, dev->addr + QVIRTIO_DEVICE_STATUS, status)= ; + qpci_io_writeb(dev->pdev, dev->addr + QVIRTIO_PCI_DEVICE_STATUS, sta= tus); } =20 static bool qvirtio_pci_get_queue_isr_status(QVirtioDevice *d, QVirtQueu= e *vq) @@ -146,7 +146,7 @@ static bool qvirtio_pci_get_queue_isr_status(QVirtioD= evice *d, QVirtQueue *vq) return data =3D=3D vqpci->msix_data; } } else { - return qpci_io_readb(dev->pdev, dev->addr + QVIRTIO_ISR_STATUS) = & 1; + return qpci_io_readb(dev->pdev, dev->addr + QVIRTIO_PCI_ISR_STAT= US) & 1; } } =20 @@ -166,26 +166,26 @@ static bool qvirtio_pci_get_config_isr_status(QVirt= ioDevice *d) return data =3D=3D dev->config_msix_data; } } else { - return qpci_io_readb(dev->pdev, dev->addr + QVIRTIO_ISR_STATUS) = & 2; + return qpci_io_readb(dev->pdev, dev->addr + QVIRTIO_PCI_ISR_STAT= US) & 2; } } =20 static void qvirtio_pci_queue_select(QVirtioDevice *d, uint16_t index) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - qpci_io_writeb(dev->pdev, dev->addr + QVIRTIO_QUEUE_SELECT, index); + qpci_io_writeb(dev->pdev, dev->addr + QVIRTIO_PCI_QUEUE_SELECT, inde= x); } =20 static uint16_t qvirtio_pci_get_queue_size(QVirtioDevice *d) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - return qpci_io_readw(dev->pdev, dev->addr + QVIRTIO_QUEUE_SIZE); + return qpci_io_readw(dev->pdev, dev->addr + QVIRTIO_PCI_QUEUE_SIZE); } =20 static void qvirtio_pci_set_queue_address(QVirtioDevice *d, uint32_t pfn= ) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - qpci_io_writel(dev->pdev, dev->addr + QVIRTIO_QUEUE_ADDRESS, pfn); + qpci_io_writel(dev->pdev, dev->addr + QVIRTIO_PCI_QUEUE_ADDRESS, pfn= ); } =20 static QVirtQueue *qvirtio_pci_virtqueue_setup(QVirtioDevice *d, @@ -227,7 +227,7 @@ static QVirtQueue *qvirtio_pci_virtqueue_setup(QVirti= oDevice *d, static void qvirtio_pci_virtqueue_kick(QVirtioDevice *d, QVirtQueue *vq) { QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; - qpci_io_writew(dev->pdev, dev->addr + QVIRTIO_QUEUE_NOTIFY, vq->inde= x); + qpci_io_writew(dev->pdev, dev->addr + QVIRTIO_PCI_QUEUE_NOTIFY, vq->= index); } =20 const QVirtioBus qvirtio_pci =3D { @@ -307,8 +307,8 @@ void qvirtqueue_pci_msix_setup(QVirtioPCIDevice *d, Q= VirtQueuePCI *vqpci, control & ~PCI_MSIX_ENTRY_CTRL_M= ASKBIT); =20 qvirtio_pci_queue_select(&d->vdev, vqpci->vq.index); - qpci_io_writew(d->pdev, d->addr + QVIRTIO_MSIX_QUEUE_VECTOR, entry); - vector =3D qpci_io_readw(d->pdev, d->addr + QVIRTIO_MSIX_QUEUE_VECTO= R); + qpci_io_writew(d->pdev, d->addr + QVIRTIO_PCI_MSIX_QUEUE_VECTOR, ent= ry); + vector =3D qpci_io_readw(d->pdev, d->addr + QVIRTIO_PCI_MSIX_QUEUE_V= ECTOR); g_assert_cmphex(vector, !=3D, QVIRTIO_MSI_NO_VECTOR); } =20 @@ -339,7 +339,7 @@ void qvirtio_pci_set_msix_configuration_vector(QVirti= oPCIDevice *d, qpci_io_writel(d->pdev, addr + PCI_MSIX_ENTRY_VECTOR_CTRL, control & ~PCI_MSIX_ENTRY_CTRL_M= ASKBIT); =20 - qpci_io_writew(d->pdev, d->addr + QVIRTIO_MSIX_CONF_VECTOR, entry); - vector =3D qpci_io_readw(d->pdev, d->addr + QVIRTIO_MSIX_CONF_VECTOR= ); + qpci_io_writew(d->pdev, d->addr + QVIRTIO_PCI_MSIX_CONF_VECTOR, entr= y); + vector =3D qpci_io_readw(d->pdev, d->addr + QVIRTIO_PCI_MSIX_CONF_VE= CTOR); g_assert_cmphex(vector, !=3D, QVIRTIO_MSI_NO_VECTOR); } diff --git a/tests/libqos/virtio-pci.h b/tests/libqos/virtio-pci.h index 883f7ff..8f0e52a 100644 --- a/tests/libqos/virtio-pci.h +++ b/tests/libqos/virtio-pci.h @@ -13,18 +13,18 @@ #include "libqos/virtio.h" #include "libqos/pci.h" =20 -#define QVIRTIO_DEVICE_FEATURES 0x00 -#define QVIRTIO_GUEST_FEATURES 0x04 -#define QVIRTIO_QUEUE_ADDRESS 0x08 -#define QVIRTIO_QUEUE_SIZE 0x0C -#define QVIRTIO_QUEUE_SELECT 0x0E -#define QVIRTIO_QUEUE_NOTIFY 0x10 -#define QVIRTIO_DEVICE_STATUS 0x12 -#define QVIRTIO_ISR_STATUS 0x13 -#define QVIRTIO_MSIX_CONF_VECTOR 0x14 -#define QVIRTIO_MSIX_QUEUE_VECTOR 0x16 -#define QVIRTIO_DEVICE_SPECIFIC_MSIX 0x18 -#define QVIRTIO_DEVICE_SPECIFIC_NO_MSIX 0x14 +#define QVIRTIO_PCI_DEVICE_FEATURES 0x00 +#define QVIRTIO_PCI_GUEST_FEATURES 0x04 +#define QVIRTIO_PCI_QUEUE_ADDRESS 0x08 +#define QVIRTIO_PCI_QUEUE_SIZE 0x0C +#define QVIRTIO_PCI_QUEUE_SELECT 0x0E +#define QVIRTIO_PCI_QUEUE_NOTIFY 0x10 +#define QVIRTIO_PCI_DEVICE_STATUS 0x12 +#define QVIRTIO_PCI_ISR_STATUS 0x13 +#define QVIRTIO_PCI_MSIX_CONF_VECTOR 0x14 +#define QVIRTIO_PCI_MSIX_QUEUE_VECTOR 0x16 +#define QVIRTIO_PCI_DEVICE_SPECIFIC_MSIX 0x18 +#define QVIRTIO_PCI_DEVICE_SPECIFIC_NO_MSIX 0x14 =20 #define QVIRTIO_PCI_ALIGN 4096 =20 diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index c48c058..fd54f58 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -157,6 +157,7 @@ static void test_basic(const QVirtioBus *bus, QVirtio= Device *dev, char *data; =20 capacity =3D qvirtio_config_readq(bus, dev, device_specific); + g_assert_cmpint(capacity, =3D=3D, TEST_IMAGE_SIZE / 512); =20 features =3D qvirtio_get_features(bus, dev); @@ -283,7 +284,7 @@ static void pci_basic(void) allo= c, 0); =20 /* MSI-X is not enabled */ - addr =3D dev->addr + QVIRTIO_DEVICE_SPECIFIC_NO_MSIX; + addr =3D dev->addr + QVIRTIO_PCI_DEVICE_SPECIFIC_NO_MSIX; =20 test_basic(&qvirtio_pci, &dev->vdev, alloc, &vqpci->vq, (uint64_t)(uintptr_t= )addr); @@ -318,7 +319,7 @@ static void pci_indirect(void) dev =3D virtio_blk_pci_init(bus, PCI_SLOT); =20 /* MSI-X is not enabled */ - addr =3D dev->addr + QVIRTIO_DEVICE_SPECIFIC_NO_MSIX; + addr =3D dev->addr + QVIRTIO_PCI_DEVICE_SPECIFIC_NO_MSIX; =20 capacity =3D qvirtio_config_readq(&qvirtio_pci, &dev->vdev, (uint64_t)(uintptr_t= )addr); @@ -412,7 +413,7 @@ static void pci_config(void) dev =3D virtio_blk_pci_init(bus, PCI_SLOT); =20 /* MSI-X is not enabled */ - addr =3D dev->addr + QVIRTIO_DEVICE_SPECIFIC_NO_MSIX; + addr =3D dev->addr + QVIRTIO_PCI_DEVICE_SPECIFIC_NO_MSIX; =20 capacity =3D qvirtio_config_readq(&qvirtio_pci, &dev->vdev, (uint64_t)(uintptr_t= )addr); @@ -459,7 +460,7 @@ static void pci_msix(void) qvirtio_pci_set_msix_configuration_vector(dev, alloc, 0); =20 /* MSI-X is enabled */ - addr =3D dev->addr + QVIRTIO_DEVICE_SPECIFIC_MSIX; + addr =3D dev->addr + QVIRTIO_PCI_DEVICE_SPECIFIC_MSIX; =20 capacity =3D qvirtio_config_readq(&qvirtio_pci, &dev->vdev, (uint64_t)(uintptr_t= )addr); @@ -572,7 +573,7 @@ static void pci_idx(void) qvirtio_pci_set_msix_configuration_vector(dev, alloc, 0); =20 /* MSI-X is enabled */ - addr =3D dev->addr + QVIRTIO_DEVICE_SPECIFIC_MSIX; + addr =3D dev->addr + QVIRTIO_PCI_DEVICE_SPECIFIC_MSIX; =20 capacity =3D qvirtio_config_readq(&qvirtio_pci, &dev->vdev, (uint64_t)(uintptr_t= )addr); --=20 2.1.0