From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpmfJ-0000Vn-8t for qemu-devel@nongnu.org; Thu, 29 Sep 2016 21:31:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpmfH-0002R2-Az for qemu-devel@nongnu.org; Thu, 29 Sep 2016 21:31:05 -0400 Date: Fri, 30 Sep 2016 11:30:45 +1000 From: David Gibson Message-ID: <20160930013045.GS30519@umbus.fritz.box> References: <1475169307-1510-1-git-send-email-lvivier@redhat.com> <1475169307-1510-4-git-send-email-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7WENQHN97/U9vH7R" Content-Disposition: inline In-Reply-To: <1475169307-1510-4-git-send-email-lvivier@redhat.com> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 3/3] tests: enable virtio tests on SPAPR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Laurent Vivier Cc: qemu-devel@nongnu.org, dgibson@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, Greg Kurz --7WENQHN97/U9vH7R Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 29, 2016 at 07:15:07PM +0200, Laurent Vivier wrote: > but disable MSI-X tests on SPAPR as we can't check the result > (the memory region used on PC is not readable on SPAPR). >=20 > Signed-off-by: Laurent Vivier > --- > tests/Makefile.include | 3 ++- > tests/libqos/virtio-pci.c | 22 ++++++++++++++++++++-- > tests/virtio-9p-test.c | 11 ++++++++++- > tests/virtio-blk-test.c | 22 +++++++++++++++++----- > tests/virtio-net-test.c | 17 +++++++++++++++-- > tests/virtio-rng-test.c | 7 ++++++- > tests/virtio-scsi-test.c | 10 +++++++++- > 7 files changed, 79 insertions(+), 13 deletions(-) >=20 > diff --git a/tests/Makefile.include b/tests/Makefile.include > index c46a32d..1e4a3d5 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -278,6 +278,7 @@ check-qtest-ppc64-y +=3D tests/usb-hcd-uhci-test$(EXE= SUF) > gcov-files-ppc64-y +=3D hw/usb/hcd-uhci.c > check-qtest-ppc64-y +=3D tests/usb-hcd-xhci-test$(EXESUF) > gcov-files-ppc64-y +=3D hw/usb/hcd-xhci.c > +check-qtest-ppc64-y +=3D $(check-qtest-virtio-y) > =20 > check-qtest-sh4-y =3D tests/endianness-test$(EXESUF) > =20 > @@ -604,7 +605,7 @@ libqos-pc-obj-y +=3D tests/libqos/ahci.o > libqos-omap-obj-y =3D $(libqos-obj-y) tests/libqos/i2c-omap.o > libqos-imx-obj-y =3D $(libqos-obj-y) tests/libqos/i2c-imx.o > libqos-usb-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libq= os/usb.o > -libqos-virtio-obj-y =3D $(libqos-pc-obj-y) tests/libqos/virtio.o tests/l= ibqos/virtio-pci.o tests/libqos/virtio-mmio.o tests/libqos/malloc-generic.o > +libqos-virtio-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/l= ibqos/virtio.o tests/libqos/virtio-pci.o tests/libqos/virtio-mmio.o tests/l= ibqos/malloc-generic.o > =20 > tests/device-introspect-test$(EXESUF): tests/device-introspect-test.o > tests/rtc-test$(EXESUF): tests/rtc-test.o > diff --git a/tests/libqos/virtio-pci.c b/tests/libqos/virtio-pci.c > index 6e005c1..ed81df6 100644 > --- a/tests/libqos/virtio-pci.c > +++ b/tests/libqos/virtio-pci.c > @@ -68,16 +68,34 @@ static uint8_t qvirtio_pci_config_readb(QVirtioDevice= *d, uint64_t addr) > return qpci_io_readb(dev->pdev, (void *)(uintptr_t)addr); > } > =20 > +/* PCI is always read in little-endian order > + * but virtio ( < 1.0) is in guest order > + * so with a big-endian guest the order has been reversed > + * reverse it again > + */ > + > static uint16_t qvirtio_pci_config_readw(QVirtioDevice *d, uint64_t addr) > { > QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; > - return qpci_io_readw(dev->pdev, (void *)(uintptr_t)addr); > + uint16_t value; > + > + value =3D qpci_io_readw(dev->pdev, (void *)(uintptr_t)addr); > + if (target_big_endian()) { > + value =3D bswap16(value); > + } Don't you need some sort of test to distinguish the virtio < 1.0 and virtio-1.0 cases? > + return value; > } > =20 > static uint32_t qvirtio_pci_config_readl(QVirtioDevice *d, uint64_t addr) > { > QVirtioPCIDevice *dev =3D (QVirtioPCIDevice *)d; > - return qpci_io_readl(dev->pdev, (void *)(uintptr_t)addr); > + uint32_t value; > + > + value =3D qpci_io_readl(dev->pdev, (void *)(uintptr_t)addr); > + if (target_big_endian()) { > + value =3D bswap32(value); > + } > + return value; > } > =20 > static uint64_t qvirtio_pci_config_readq(QVirtioDevice *d, uint64_t addr) > diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c > index 28d7f5b..a73bccb 100644 > --- a/tests/virtio-9p-test.c > +++ b/tests/virtio-9p-test.c > @@ -11,6 +11,7 @@ > #include "libqtest.h" > #include "qemu-common.h" > #include "libqos/libqos-pc.h" > +#include "libqos/libqos-spapr.h" > #include "libqos/virtio.h" > #include "libqos/virtio-pci.h" > #include "standard-headers/linux/virtio_ids.h" > @@ -22,12 +23,20 @@ static char *test_share; > =20 > static QOSState *qvirtio_9p_start(void) > { > + const char *arch =3D qtest_get_arch(); > + QOSState *qs =3D NULL; > test_share =3D g_strdup("/tmp/qtest.XXXXXX"); > g_assert_nonnull(mkdtemp(test_share)); > const char *cmd =3D "-fsdev local,id=3Dfsdev0,security_model=3Dnone,= path=3D%s " > "-device virtio-9p-pci,fsdev=3Dfsdev0,mount_tag=3D= %s"; > =20 > - return qtest_pc_boot(cmd, test_share, mount_tag); > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { > + qs =3D qtest_pc_boot(cmd, test_share, mount_tag); > + } else if (strcmp(arch, "ppc64") =3D=3D 0) { > + qs =3D qtest_spapr_boot(cmd, test_share, mount_tag); > + } > + > + return qs; > } > =20 > static void qvirtio_9p_stop(QOSState *qs) > diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c > index a4de3e4..a032f8e 100644 > --- a/tests/virtio-blk-test.c > +++ b/tests/virtio-blk-test.c > @@ -11,6 +11,7 @@ > #include "qemu/osdep.h" > #include "libqtest.h" > #include "libqos/libqos-pc.h" > +#include "libqos/libqos-spapr.h" > #include "libqos/virtio.h" > #include "libqos/virtio-pci.h" > #include "libqos/virtio-mmio.h" > @@ -58,6 +59,7 @@ static char *drive_create(void) > =20 > static QOSState *pci_test_start(void) > { > + const char *arch =3D qtest_get_arch(); > QOSState *qs =3D NULL; > char *tmp_path; > const char *cmd =3D "-drive if=3Dnone,id=3Ddrive0,file=3D%s,format= =3Draw " > @@ -67,7 +69,11 @@ static QOSState *pci_test_start(void) > =20 > tmp_path =3D drive_create(); > =20 > - qs =3D qtest_pc_boot(cmd, tmp_path, PCI_SLOT, PCI_FN); > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { > + qs =3D qtest_pc_boot(cmd, tmp_path, PCI_SLOT, PCI_FN); > + } else if (strcmp(arch, "ppc64") =3D=3D 0) { > + qs =3D qtest_spapr_boot(cmd, tmp_path, PCI_SLOT, PCI_FN); > + } > unlink(tmp_path); > g_free(tmp_path); > return qs; > @@ -676,6 +682,7 @@ static void pci_hotplug(void) > { > QVirtioPCIDevice *dev; > QOSState *qs; > + const char *arch =3D qtest_get_arch(); > =20 > qs =3D pci_test_start(); > g_assert(qs); > @@ -690,7 +697,9 @@ static void pci_hotplug(void) > g_free(dev); > =20 > /* unplug secondary disk */ > - qpci_unplug_acpi_device_test("drv1", PCI_SLOT_HP); > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { > + qpci_unplug_acpi_device_test("drv1", PCI_SLOT_HP); > + } > qtest_shutdown(qs); > } > =20 > @@ -741,12 +750,15 @@ int main(int argc, char **argv) > =20 > g_test_init(&argc, &argv, NULL); > =20 > - if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= || > + strcmp(arch, "ppc") =3D=3D 0 || strcmp(arch, "ppc64") =3D=3D 0) { > qtest_add_func("/virtio/blk/pci/basic", pci_basic); > qtest_add_func("/virtio/blk/pci/indirect", pci_indirect); > qtest_add_func("/virtio/blk/pci/config", pci_config); > - qtest_add_func("/virtio/blk/pci/msix", pci_msix); > - qtest_add_func("/virtio/blk/pci/idx", pci_idx); > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D= =3D 0) { > + qtest_add_func("/virtio/blk/pci/msix", pci_msix); > + qtest_add_func("/virtio/blk/pci/idx", pci_idx); > + } > qtest_add_func("/virtio/blk/pci/hotplug", pci_hotplug); > } else if (strcmp(arch, "arm") =3D=3D 0) { > qtest_add_func("/virtio/blk/mmio/basic", mmio_basic); > diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c > index 3e83685..14f2920 100644 > --- a/tests/virtio-net-test.c > +++ b/tests/virtio-net-test.c > @@ -13,6 +13,7 @@ > #include "qemu/sockets.h" > #include "qemu/iov.h" > #include "libqos/libqos-pc.h" > +#include "libqos/libqos-spapr.h" > #include "libqos/virtio.h" > #include "libqos/virtio-pci.h" > #include "qemu/bswap.h" > @@ -52,10 +53,17 @@ static QVirtioPCIDevice *virtio_net_pci_init(QPCIBus = *bus, int slot) > =20 > static QOSState *pci_test_start(int socket) > { > + const char *arch =3D qtest_get_arch(); > const char *cmd =3D "-netdev socket,fd=3D%d,id=3Dhs0 -device " > "virtio-net-pci,netdev=3Dhs0"; > =20 > - return qtest_pc_boot(cmd, socket); > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { > + return qtest_pc_boot(cmd, socket); > + } > + if (strcmp(arch, "ppc64") =3D=3D 0) { > + return qtest_spapr_boot(cmd, socket); > + } > + return NULL; > } > =20 > static void driver_init(const QVirtioBus *bus, QVirtioDevice *dev) > @@ -236,10 +244,15 @@ static void pci_basic(gconstpointer data) > =20 > static void hotplug(void) > { > + const char *arch =3D qtest_get_arch(); > + > qtest_start("-device virtio-net-pci"); > =20 > qpci_plug_device_test("virtio-net-pci", "net1", PCI_SLOT_HP, NULL); > - qpci_unplug_acpi_device_test("net1", PCI_SLOT_HP); > + > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { > + qpci_unplug_acpi_device_test("net1", PCI_SLOT_HP); > + } > =20 > test_end(); > } > diff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c > index e1b2640..dcecf77 100644 > --- a/tests/virtio-rng-test.c > +++ b/tests/virtio-rng-test.c > @@ -20,8 +20,13 @@ static void pci_nop(void) > =20 > static void hotplug(void) > { > + const char *arch =3D qtest_get_arch(); > + > qpci_plug_device_test("virtio-rng-pci", "rng1", PCI_SLOT_HP, NULL); > - qpci_unplug_acpi_device_test("rng1", PCI_SLOT_HP); > + > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { > + qpci_unplug_acpi_device_test("rng1", PCI_SLOT_HP); > + } > } > =20 > int main(int argc, char **argv) > diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c > index 721ae1f..dd5457b 100644 > --- a/tests/virtio-scsi-test.c > +++ b/tests/virtio-scsi-test.c > @@ -12,6 +12,7 @@ > #include "libqtest.h" > #include "block/scsi.h" > #include "libqos/libqos-pc.h" > +#include "libqos/libqos-spapr.h" > #include "libqos/virtio.h" > #include "libqos/virtio-pci.h" > #include "standard-headers/linux/virtio_ids.h" > @@ -33,11 +34,18 @@ typedef struct { > =20 > static QOSState *qvirtio_scsi_start(const char *extra_opts) > { > + const char *arch =3D qtest_get_arch(); > const char *cmd =3D "-drive id=3Ddrv0,if=3Dnone,file=3D/dev/null,for= mat=3Draw " > "-device virtio-scsi-pci,id=3Dvs0 " > "-device scsi-hd,bus=3Dvs0.0,drive=3Ddrv0 %s"; > =20 > - return qtest_pc_boot(cmd, extra_opts ? : ""); > + if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0= ) { > + return qtest_pc_boot(cmd, extra_opts ? : ""); > + } > + if (strcmp(arch, "ppc64") =3D=3D 0) { > + return qtest_spapr_boot(cmd, extra_opts ? : ""); > + } > + return NULL; > } > =20 > static void qvirtio_scsi_stop(QOSState *qs) --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --7WENQHN97/U9vH7R Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX7cBFAAoJEGw4ysog2bOS6NsP/2198de2SPojUOZhIO4YoIT0 h7cZNSES5MeEOo/IGrSa+twczuE4S6P8ta4+FsyG4LQyBbD7hthwDEkOq5uqAGuQ nAC7rB9rDFiJzveZQ5UXPJ4DJNUZlf6bdnGHS/4ZHIDxaIh5oqZkxWv5UkJNJaCV 8P+dVaa+oue3ZPjkp9LVraewVEX1s95aIZwAPl5XyOcqEzpCHI69PnFthK5iyFwP yA2wm54v6qq3CrxFO1LFb8JFjxq7c+ML4eX81IPCfHUyaF89pzGFZ+WR1zIsqB3J mX0qsX795YAr0KhqNd45hmBXXBwyjye5mD7saLqjDjodq+JayZlTyvEJ8aRa4sTo IcC3wC0M2jMegBq9X61lNjLzU/hvtoGv0LFWkBgaMBTQLECwwc9yT/fTIRI+//5t B0tmGe/sBt9kvX8uKU0RpcUf28BWxOAd8DSa7IX2n0bvYzCiMfLTHpS3h4itBFfa Mi8GsUdNxstMcOiKIBIuBuhgUVD8G+BxvaiBGV4iUbMkdYR/uDtoMQ2U++L1b5CF TceXbHVcZGT+6uet7jlQGlFkkkB8hKmYinn3CONui0n4Naf5y94MxlOb5025Bf5z u82Y182Ql+WL4sqLmnIJRFZmOBVReMBT1rCDQVTcFg3rcLhzLz9QTAzDJUa5J300 OR/o2Ky9rq6e39u9fsqC =JimK -----END PGP SIGNATURE----- --7WENQHN97/U9vH7R--