From nobody Tue Feb 10 17:08:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512032378785124.60280520047127; Thu, 30 Nov 2017 00:59:38 -0800 (PST) Received: from localhost ([::1]:46888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eKKgv-0001st-5c for importer@patchew.org; Thu, 30 Nov 2017 03:59:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eKKaw-0005Ck-Hp for qemu-devel@nongnu.org; Thu, 30 Nov 2017 03:53:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eKKav-0006l7-HL for qemu-devel@nongnu.org; Thu, 30 Nov 2017 03:53:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60214) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eKKas-0006fX-Sv; Thu, 30 Nov 2017 03:53:19 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BDD67C04D318; Thu, 30 Nov 2017 08:53:17 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-158.ams2.redhat.com [10.36.116.158]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22A425D6A5; Thu, 30 Nov 2017 08:53:14 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Thu, 30 Nov 2017 09:53:03 +0100 Message-Id: <1512031988-32490-3-git-send-email-thuth@redhat.com> In-Reply-To: <1512031988-32490-1-git-send-email-thuth@redhat.com> References: <1512031988-32490-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 30 Nov 2017 08:53:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.12 2/7] tests/boot-serial-test: Add code to allow to specify our own kernel or bios X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anthony Green , Laurent Vivier , qemu-arm@nongnu.org, Edgar Iglesias , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" QEMU only ships with some few firmware images, i.e. we can currently run the boot-serial test only on a very limited set of machines. But writing some characters to the default UART of a machine can often be done with some few lines of assembly, so we add the possibility to the boot-serial tester to use its own mini-kernels or mini-firmwares. We write such images then into a file that we can load with the "-kernel" or "-bios" parameter when we launch QEMU. Signed-off-by: Thomas Huth --- tests/Makefile.include | 2 ++ tests/boot-serial-test.c | 54 +++++++++++++++++++++++++++++++++++++-------= ---- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index c002352..41ca44c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -297,6 +297,8 @@ gcov-files-x86_64-y =3D $(subst i386-softmmu/,x86_64-so= ftmmu/,$(gcov-files-i386-y) =20 check-qtest-alpha-y =3D tests/boot-serial-test$(EXESUF) =20 +check-qtest-m68k-y =3D tests/boot-serial-test$(EXESUF) + check-qtest-mips-y =3D tests/endianness-test$(EXESUF) =20 check-qtest-mips64-y =3D tests/endianness-test$(EXESUF) diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index fa4183d..d997269 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -7,9 +7,10 @@ * or later. See the COPYING file in the top-level directory. * * This test is used to check that the serial output of the firmware - * (that we provide for some machines) contains an expected string. - * Thus we check that the firmware still boots at least to a certain - * point and so we know that the machine is not completely broken. + * (that we provide for some machines) or some small mini-kernels that + * we provide here contains an expected string. Thus we check that the + * firmware/kernel still boots at least to a certain point and so we + * know that the machine is not completely broken. */ =20 #include "qemu/osdep.h" @@ -20,6 +21,9 @@ typedef struct testdef { const char *machine; /* Name of the machine */ const char *extra; /* Additional parameters */ const char *expect; /* Expected string in the serial output */ + size_t codesize; /* Size of the kernel or bios data */ + const uint8_t *kernel; /* Set in case we use our own mini kernel */ + const uint8_t *bios; /* Set in case we use our own mini bios */ } testdef_t; =20 static testdef_t tests[] =3D { @@ -72,26 +76,52 @@ done: static void test_machine(const void *data) { const testdef_t *test =3D data; - char tmpname[] =3D "/tmp/qtest-boot-serial-XXXXXX"; - int fd; + char serialtmp[] =3D "/tmp/qtest-boot-serial-sXXXXXX"; + char codetmp[] =3D "/tmp/qtest-boot-serial-cXXXXXX"; + const char *codeparam =3D ""; + const uint8_t *code =3D NULL; + int ser_fd; =20 - fd =3D mkstemp(tmpname); - g_assert(fd !=3D -1); + ser_fd =3D mkstemp(serialtmp); + g_assert(ser_fd !=3D -1); + + if (test->kernel) { + code =3D test->kernel; + codeparam =3D "-kernel"; + } else if (test->bios) { + code =3D test->bios; + codeparam =3D "-bios"; + } + + if (code) { + ssize_t wlen; + int code_fd; + + code_fd =3D mkstemp(codetmp); + g_assert(code_fd !=3D -1); + wlen =3D write(code_fd, code, test->codesize); + g_assert(wlen =3D=3D test->codesize); + close(code_fd); + } =20 /* * Make sure that this test uses tcg if available: It is used as a * fast-enough smoketest for that. */ - global_qtest =3D qtest_startf("-M %s,accel=3Dtcg:kvm " + global_qtest =3D qtest_startf("%s %s -M %s,accel=3Dtcg:kvm " "-chardev file,id=3Dserial0,path=3D%s " "-no-shutdown -serial chardev:serial0 %s", - test->machine, tmpname, test->extra); - unlink(tmpname); + codeparam, code ? codetmp : "", + test->machine, serialtmp, test->extra); + unlink(serialtmp); + if (code) { + unlink(codetmp); + } =20 - check_guest_output(test, fd); + check_guest_output(test, ser_fd); qtest_quit(global_qtest); =20 - close(fd); + close(ser_fd); } =20 int main(int argc, char *argv[]) --=20 1.8.3.1