Commit aa9026fd authored by Laurent Vivier's avatar Laurent Vivier Committed by David Gibson
Browse files

tests: enable ohci/uhci/xhci tests on PPC64 



Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 61ae5cf3

tests/Makefile.include

+7 −1
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ check-qtest-ppc64-y += tests/postcopy-test$(EXESUF) 
check-qtest-ppc64-y += tests/boot-serial-test$(EXESUF)

check-qtest-ppc64-y += tests/rtas-test$(EXESUF)

check-qtest-ppc64-y += tests/pxe-test$(EXESUF)

check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)

gcov-files-ppc64-y += hw/usb/hcd-ohci.c

check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)

gcov-files-ppc64-y += hw/usb/hcd-uhci.c

check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)

gcov-files-ppc64-y += hw/usb/hcd-xhci.c



check-qtest-sh4-y = tests/endianness-test$(EXESUF)
@@ -597,7 +603,7 @@ libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o 
libqos-pc-obj-y += tests/libqos/ahci.o

libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o

libqos-imx-obj-y = $(libqos-obj-y) tests/libqos/i2c-imx.o

libqos-usb-obj-y = $(libqos-pc-obj-y) tests/libqos/usb.o

libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/usb.o

libqos-virtio-obj-y = $(libqos-pc-obj-y) tests/libqos/virtio.o tests/libqos/virtio-pci.o tests/libqos/virtio-mmio.o tests/libqos/malloc-generic.o



tests/device-introspect-test$(EXESUF): tests/device-introspect-test.o

tests/usb-hcd-uhci-test.c

+16 −8
Original line number Diff line number Diff line
@@ -9,9 +9,13 @@ 


#include "qemu/osdep.h"

#include "libqtest.h"

#include "libqos/libqos.h"

#include "libqos/usb.h"

#include "libqos/libqos-pc.h"

#include "libqos/libqos-spapr.h"

#include "hw/usb/uhci-regs.h"



static QOSState *qs;



static void test_uhci_init(void)

{
@@ -19,13 +23,10 @@ static void test_uhci_init(void) 


static void test_port(int port)

{

    QPCIBus *pcibus;

    struct qhc uhci;



    g_assert(port > 0);

    pcibus = qpci_init_pc(NULL);

    g_assert(pcibus != NULL);

    qusb_pci_init_one(pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);

    qusb_pci_init_one(qs->pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);

    uhci_port_test(&uhci, port - 1, UHCI_PORT_CCS);

}
@@ -75,6 +76,7 @@ static void test_usb_storage_hotplug(void) 


int main(int argc, char **argv)

{

    const char *arch = qtest_get_arch();

    int ret;



    g_test_init(&argc, &argv, NULL);
@@ -84,11 +86,17 @@ int main(int argc, char **argv) 
    qtest_add_func("/uhci/pci/hotplug", test_uhci_hotplug);

    qtest_add_func("/uhci/pci/hotplug/usb-storage", test_usb_storage_hotplug);



    qtest_start("-device piix3-usb-uhci,id=uhci,addr=1d.0"

    if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {

        qs = qtest_pc_boot("-device piix3-usb-uhci,id=uhci,addr=1d.0"

                           " -drive id=drive0,if=none,file=/dev/null,format=raw"

                           " -device usb-tablet,bus=uhci.0,port=1");

    } else if (strcmp(arch, "ppc64") == 0) {

        qs = qtest_spapr_boot("-device piix3-usb-uhci,id=uhci,addr=1d.0"

                           " -drive id=drive0,if=none,file=/dev/null,format=raw"

                           " -device usb-tablet,bus=uhci.0,port=1");

    }

    ret = g_test_run();

    qtest_end();

    qtest_shutdown(qs);



    return ret;

}