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

qtest: add ivshmem-test for ppc64 



The test has been converted to use libqos, we can
now use it on ppc64. We also make the test fail on
all other architectures.
As libqos on ppc64 is not able to manage hotplug
and IRQ/MSI, we disable this part in the test on ppc64.

Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
[dwg: Make test conditional on CONFIG_EVENTFD]
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent d69487d5

tests/Makefile.include

+2 −1
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ check-qtest-ppc64-y += tests/test-netfilter$(EXESUF) 
check-qtest-ppc64-y += tests/test-filter-mirror$(EXESUF)

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

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

check-qtest-ppc64-$(CONFIG_EVENTFD) += tests/ivshmem-test$(EXESUF)



check-qtest-sh4-y = tests/endianness-test$(EXESUF)
@@ -715,7 +716,7 @@ tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y) 
tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)

tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)

tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y)

tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y)

tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)

tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o contrib/libvhost-user/libvhost-user.o $(test-util-obj-y)

tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)

tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o

tests/ivshmem-test.c

+13 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <glib/gstdio.h>

#include "contrib/ivshmem-server/ivshmem-server.h"

#include "libqos/libqos-pc.h"

#include "libqos/libqos-spapr.h"

#include "libqtest.h"

#include "qemu-common.h"
@@ -124,8 +125,10 @@ static void setup_vm_cmd(IVState *s, const char *cmd, bool msix) 


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

        s->qs = qtest_pc_boot(cmd);

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

        s->qs = qtest_spapr_boot(cmd);

    } else {

        g_printerr("ivshmem-test tests are only available on x86\n");

        g_printerr("ivshmem-test tests are only available on x86 or ppc64\n");

        exit(EXIT_FAILURE);

    }

    s->dev = get_device(s->qs->pcibus);
@@ -415,6 +418,7 @@ static void test_ivshmem_server_irq(void) 


static void test_ivshmem_hotplug(void)

{

    const char *arch = qtest_get_arch();

    gchar *opts;



    qtest_start("");
@@ -422,7 +426,9 @@ static void test_ivshmem_hotplug(void) 
    opts = g_strdup_printf("'shm': '%s', 'size': '1M'", tmpshm);



    qpci_plug_device_test("ivshmem", "iv1", PCI_SLOT_HP, opts);

    if (strcmp(arch, "ppc64") != 0) {

        qpci_unplug_acpi_device_test("iv1", PCI_SLOT_HP);

    }



    qtest_end();

    g_free(opts);
@@ -494,6 +500,7 @@ static gchar *mktempshm(int size, int *fd) 
int main(int argc, char **argv)

{

    int ret, fd;

    const char *arch = qtest_get_arch();

    gchar dir[] = "/tmp/ivshmem-test.XXXXXX";



#if !GLIB_CHECK_VERSION(2, 31, 0)
@@ -524,9 +531,11 @@ int main(int argc, char **argv) 
    qtest_add_func("/ivshmem/memdev", test_ivshmem_memdev);

    if (g_test_slow()) {

        qtest_add_func("/ivshmem/pair", test_ivshmem_pair);

        if (strcmp(arch, "ppc64") != 0) {

            qtest_add_func("/ivshmem/server-msi", test_ivshmem_server_msi);

            qtest_add_func("/ivshmem/server-irq", test_ivshmem_server_irq);

        }

    }



    ret = g_test_run();