From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDeDE-0005np-Pp for qemu-devel@nongnu.org; Sun, 25 Aug 2013 13:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VDeD8-0004e0-Ow for qemu-devel@nongnu.org; Sun, 25 Aug 2013 13:34:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52418 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VDeD8-0004do-1D for qemu-devel@nongnu.org; Sun, 25 Aug 2013 13:34:46 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3D1BBA3B99 for ; Sun, 25 Aug 2013 19:34:45 +0200 (CEST) Message-ID: <521A402F.9020806@suse.de> Date: Sun, 25 Aug 2013 19:34:39 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1375709247-10002-1-git-send-email-afaerber@suse.de> <1375709247-10002-22-git-send-email-afaerber@suse.de> <51D295AB-645A-4066-A0B6-2BD1B609D9E2@suse.de> In-Reply-To: <51D295AB-645A-4066-A0B6-2BD1B609D9E2@suse.de> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-1.6? v2 21/21] qtest: Prepare QOM machine tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: qemu-devel@nongnu.org Am 25.08.2013 19:22, schrieb Alexander Graf: >=20 > On 05.08.2013, at 14:27, Andreas F=E4rber wrote: >=20 >> Instantiate all [*] machines per target, so that they get a bit of tes= t >> coverage at all. This has proven helpful during QOM refactorings. >> >> [*] ppcemb target contains some non-working non-embedded machines, and >> ppc405 CPUs are not available there either. >=20 > So I just looked up the spec and ppc405 does support 1k TLB entries, so= it is eligible for the ppcemb target. The fact that it doesn't work is a= bug :). Thanks for clarifying! >> i386 and x86_64 do not cover pc*-x.y or xenfv. >> >> Signed-off-by: Andreas F=E4rber >> --- >> tests/Makefile | 26 ++++++ >> tests/qom-test.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++= ++++++++ >> 2 files changed, 306 insertions(+) >> create mode 100644 tests/qom-test.c >> >> diff --git a/tests/Makefile b/tests/Makefile >> index d044908..a7e1319 100644 >> --- a/tests/Makefile >> +++ b/tests/Makefile >> @@ -63,25 +63,50 @@ check-qtest-i386-y +=3D tests/boot-order-test$(EXE= SUF) >> check-qtest-i386-y +=3D tests/rtc-test$(EXESUF) >> check-qtest-i386-y +=3D tests/i440fx-test$(EXESUF) >> check-qtest-i386-y +=3D tests/fw_cfg-test$(EXESUF) >> +check-qtest-i386-y +=3D tests/qom-test$(EXESUF) >> check-qtest-x86_64-y =3D $(check-qtest-i386-y) >> gcov-files-i386-y +=3D i386-softmmu/hw/mc146818rtc.c >> gcov-files-x86_64-y =3D $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-f= iles-i386-y)) >> check-qtest-mips-y =3D tests/endianness-test$(EXESUF) >> check-qtest-mips64-y =3D tests/endianness-test$(EXESUF) >> check-qtest-mips64el-y =3D tests/endianness-test$(EXESUF) >> +check-qtest-mips-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-mipsel-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-mips64-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-mips64el-y +=3D tests/qom-test$(EXESUF) >> check-qtest-ppc-y =3D tests/endianness-test$(EXESUF) >> check-qtest-ppc64-y =3D tests/endianness-test$(EXESUF) >> check-qtest-sh4-y =3D tests/endianness-test$(EXESUF) >> check-qtest-sh4eb-y =3D tests/endianness-test$(EXESUF) >> +check-qtest-sh4-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-sh4eb-y +=3D tests/qom-test$(EXESUF) >> check-qtest-sparc64-y =3D tests/endianness-test$(EXESUF) >> #check-qtest-sparc-y =3D tests/m48t59-test$(EXESUF) >> #check-qtest-sparc64-y +=3D tests/m48t59-test$(EXESUF) >> gcov-files-sparc-y +=3D hw/m48t59.c >> gcov-files-sparc64-y +=3D hw/m48t59.c >> +check-qtest-sparc-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-sparc64-y +=3D tests/qom-test$(EXESUF) >> check-qtest-arm-y =3D tests/tmp105-test$(EXESUF) >> gcov-files-arm-y +=3D hw/tmp105.c >> +check-qtest-arm-y +=3D tests/qom-test$(EXESUF) >> check-qtest-ppc-y +=3D tests/boot-order-test$(EXESUF) >> check-qtest-ppc64-y +=3D tests/boot-order-test$(EXESUF) >> +check-qtest-ppc-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-ppc64-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-ppcemb-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-alpha-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-cris-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-lm32-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-m68k-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-microblaze-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-microblazeel-y =3D $(check-qtest-microblaze-y) >> +check-qtest-moxie-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-or32-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-s390x-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-unicore32-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-xtensa-y +=3D tests/qom-test$(EXESUF) >> +check-qtest-xtensaeb-y =3D $(check-qtest-xtensa-y) >> >> check-qapi-schema-y :=3D $(addprefix tests/qapi-schema/, \ >> comments.json empty.json funny-char.json indented-expr.json \ >> @@ -161,6 +186,7 @@ tests/boot-order-test$(EXESUF): tests/boot-order-t= est.o $(libqos-obj-y) >> tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y) >> tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y) >> tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y) >> +tests/qom-test$(EXESUF): tests/qom-test.o >> >> # QTest rules >> >> diff --git a/tests/qom-test.c b/tests/qom-test.c >> new file mode 100644 >> index 0000000..c9494e0 >> --- /dev/null >> +++ b/tests/qom-test.c >> @@ -0,0 +1,280 @@ >> +/* >> + * QTest testcase for QOM >> + * >> + * Copyright (c) 2013 SUSE LINUX Products GmbH >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2 or= later. >> + * See the COPYING file in the top-level directory. >> + */ >> +#include "libqtest.h" >> + >> +#include >> +#include >> +#include "qemu/osdep.h" >> + >> +static void test_nop(gconstpointer data) >> +{ >> + QTestState *s; >> + const char *machine =3D data; >> + char *args; >> + >> + args =3D g_strdup_printf("-display none -machine %s", machine); >> + s =3D qtest_start(args); >> + if (s) { >> + qtest_quit(s); >> + } >> + g_free(args); >> +} >> + >> +static const char *x86_machines[] =3D { >> + "pc", >> + "isapc", >> + "q35", >> +}; >> + >> +static const char *alpha_machines[] =3D { >> + "clipper", >> +}; >> + >> +static const char *arm_machines[] =3D { >> + "integratorcp", >> + "versatilepb", >> + "versatileab", >> + "lm3s811evb", >> + "lm3s6965evb", >> + "collie", >> + "akita", >> + "spitz", >> + "borzoi", >> + "terrier", >> + "tosa", >> + "cheetah", >> + "sx1-v1", >> + "sx1", >> + "realview-eb", >> + "realview-eb-mpcore", >> + "realview-pb-a8", >> + "realview-pbx-a9", >> + "musicpal", >> + "mainstone", >> + "connex", >> + "verdex", >> + "z2", >> + "n800", >> + "n810", >> + "kzm", >> + "vexpress-a9", >> + "vexpress-a15", >> + "smdkc210", >> + "nuri", >> + "xilinx-zynq-a9", >> + "highbank", >> + "midway", >> +}; >> + >> +static const char *cris_machines[] =3D { >> + "axis-dev88", >> +}; >> + >> +static const char *lm32_machines[] =3D { >> + "lm32-evr", >> + "lm32-uclinux", >> + "milkymist", >> +}; >> + >> +static const char *m68k_machines[] =3D { >> + "mcf5208evb", >> + "an5206", >> + "dummy", >> +}; >> + >> +static const char *microblaze_machines[] =3D { >> + "petalogix-ml605", >> + "petalogix-s3adsp1800", >> +}; >> + >> +static const char *mips_machines[] =3D { >> + "malta", >> + "magnum", >> + "mips", >> + "mipssim", >> + "pica61", >> +}; >> + >> +static const char *moxie_machines[] =3D { >> + "moxiesim", >> +}; >> + >> +static const char *openrisc_machines[] =3D { >> + "or32-sim", >> +}; >> + >> +static const char *ppc_machines[] =3D { >> + "g3beige", >> + "mac99", >> + "prep", >> + "mpc8544ds", >> + "ppce500", >> +}; >> + >> +static const char *ppc405_machines[] =3D { >> + "ref405ep", >> + "taihu", >> +}; >> + >> +static const char *ppc440_machines[] =3D { >> + "bamboo", >> + "virtex-ml507", >> +}; >> + >> +static const char *s390_machines[] =3D { >> + "s390-virtio", >> + "s390-ccw-virtio", >> +}; >> + >> +static const char *superh_machines[] =3D { >> + "r2d", >> + "shix", >> +}; >> + >> +static const char *sparc_machines[] =3D { >> + "SS-4", >> + "SS-5", >> + "SS-10", >> + "SS-20", >> + "SS-600MP", >> + "LX", >> + "SPARCClassic", >> + "SPARCbook", >> + "leon3_generic", >> +}; >> + >> +static const char *sparc64_machines[] =3D { >> + "sun4u", >> + "sun4v", >> + "Niagara", >> +}; >> + >> +static const char *unicore32_machines[] =3D { >> + "puv3", >> +}; >> + >> +static const char *xtensa_machines[] =3D { >> + "sim", >> + "lx60", >> + "lx200", >> +}; >> + >> +static void add_test_cases(const char *arch, const char *machine) >> +{ >> + char *path; >> + path =3D g_strdup_printf("/%s/qom/%s", arch, machine); >> + g_test_add_data_func(path, machine, test_nop); >> +} >> + >> +int main(int argc, char **argv) >> +{ >> + const char *arch =3D qtest_get_arch(); >> + int i; >> + >> + g_test_init(&argc, &argv, NULL); >> + >> + add_test_cases(arch, "none"); >> + >> + if (strcmp(arch, "i386") =3D=3D 0 || >> + strcmp(arch, "x86_64") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(x86_machines); i++) { >> + add_test_cases(arch, x86_machines[i]); >> + } >> + } else if (strcmp(arch, "alpha") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(alpha_machines); i++) { >> + add_test_cases(arch, alpha_machines[i]); >> + } >> + } else if (strcmp(arch, "arm") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(arm_machines); i++) { >> + add_test_cases(arch, arm_machines[i]); >> + } >> + } else if (strcmp(arch, "cris") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(cris_machines); i++) { >> + add_test_cases(arch, cris_machines[i]); >> + } >> + } else if (strcmp(arch, "lm32") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(lm32_machines); i++) { >> + add_test_cases(arch, lm32_machines[i]); >> + } >> + } else if (strcmp(arch, "m68k") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(m68k_machines); i++) { >> + add_test_cases(arch, m68k_machines[i]); >> + } >> + } else if (strcmp(arch, "microblaze") =3D=3D 0 || >> + strcmp(arch, "microblazeel") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(microblaze_machines); i++) { >> + add_test_cases(arch, microblaze_machines[i]); >> + } >> + } else if (strcmp(arch, "mips") =3D=3D 0 || >> + strcmp(arch, "mipsel") =3D=3D 0 || >> + strcmp(arch, "mips64") =3D=3D 0 || >> + strcmp(arch, "mips64el") =3D=3D 0) { >=20 > strncmp? I don't like the idea of allowing trailing junk so much... >> + for (i =3D 0; i < ARRAY_SIZE(mips_machines); i++) { >> + add_test_cases(arch, mips_machines[i]); >> + } >> + if (strcmp(arch, "mips64el") =3D=3D 0) { >> + add_test_cases(arch, "fulong2e"); >> + } >> + } else if (strcmp(arch, "moxie") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(moxie_machines); i++) { >> + add_test_cases(arch, moxie_machines[i]); >> + } >> + } else if (strcmp(arch, "or32") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(openrisc_machines); i++) { >> + add_test_cases(arch, openrisc_machines[i]); >> + } >> + } else if (strcmp(arch, "ppc") =3D=3D 0 || >> + strcmp(arch, "ppc64") =3D=3D 0 || >> + strcmp(arch, "ppcemb") =3D=3D 0) { >=20 > I think it's more readable to list the targets individually here in sep= arate branches. >=20 > ppcemb > ppcemb_machines > ppc > ppcemb_machines > ppc_machines > ppc64 > ppcemb_machines > ppc_machines > ppc64_machines >=20 > with ppcemb_machines =3D=3D ppc405_machines + ppc440_machines. >=20 > I think it would also make sense to create a macro for the for loops >=20 > #define MACHINES_ADD(array) for (i =3D 0; i < ARRAY_SIZE(array); i++) {= \ > add_test_cases(arch, array[i]); \ > } >=20 > } else if(!strcmp(arch, "ppcemb")) { > MACHINES_ADD(ppcemb_machines); > } else if(!strcmp(arch, "ppc")) { > MACHINES_ADD(ppcemb_machines); > MACHINES_ADD(ppc_machines); > } else if (!strcmp(arch, "ppc64")) { > MACHINES_ADD(ppcemb_machines); > MACHINES_ADD(ppc_machines); > MACHINES_ADD(ppc64_machines); > } Good idea! Thanks, Andreas >=20 >> + if (strcmp(arch, "ppcemb") !=3D 0) { >> + /* XXX Currently available in ppcemb but shouldn't be */ >> + for (i =3D 0; i < ARRAY_SIZE(ppc_machines); i++) { >> + add_test_cases(arch, ppc_machines[i]); >> + } >> + /* XXX Currently available in ppcemb but don't work */ >> + for (i =3D 0; i < ARRAY_SIZE(ppc405_machines); i++) { >> + add_test_cases(arch, ppc405_machines[i]); >> + } >> + } >> + for (i =3D 0; i < ARRAY_SIZE(ppc440_machines); i++) { >> + add_test_cases(arch, ppc440_machines[i]); >> + } >> + if (strcmp(arch, "ppc64") =3D=3D 0) { >> + add_test_cases(arch, "pseries"); >> + } >> + } else if (strcmp(arch, "s390x") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(s390_machines); i++) { >> + add_test_cases(arch, s390_machines[i]); >> + } >> + } else if (strcmp(arch, "sh4") =3D=3D 0 || >> + strcmp(arch, "sh4eb") =3D=3D 0) { >=20 > strncmp maybe? >=20 >> + for (i =3D 0; i < ARRAY_SIZE(superh_machines); i++) { >> + add_test_cases(arch, superh_machines[i]); >> + } >> + } else if (strcmp(arch, "sparc") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(sparc_machines); i++) { >> + add_test_cases(arch, sparc_machines[i]); >> + } >> + } else if (strcmp(arch, "sparc64") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(sparc64_machines); i++) { >> + add_test_cases(arch, sparc64_machines[i]); >> + } >> + } else if (strcmp(arch, "unicore32") =3D=3D 0) { >> + for (i =3D 0; i < ARRAY_SIZE(unicore32_machines); i++) { >> + add_test_cases(arch, unicore32_machines[i]); >> + } >> + } else if (strcmp(arch, "xtensa") =3D=3D 0 || >> + strcmp(arch, "xtensaeb") =3D=3D 0) { >=20 > strncmp? >=20 >=20 > Alex >=20 >> + for (i =3D 0; i < ARRAY_SIZE(xtensa_machines); i++) { >> + add_test_cases(arch, xtensa_machines[i]); >> + } >> + } >> + >> + return g_test_run(); >> +} >> --=20 >> 1.8.1.4 >> >> >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg