From nobody Sat Oct 25 21:45:34 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1521100306522507.8462935455291; Thu, 15 Mar 2018 00:51:46 -0700 (PDT) Received: from localhost ([::1]:50140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewNft-0000Yc-NK for importer@patchew.org; Thu, 15 Mar 2018 03:51:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewNdh-0007Ub-2w for qemu-devel@nongnu.org; Thu, 15 Mar 2018 03:49:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewNdf-0004dX-Qo for qemu-devel@nongnu.org; Thu, 15 Mar 2018 03:49:29 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43668 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ewNdc-0004Xm-MS; Thu, 15 Mar 2018 03:49:24 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 33827D1451; Thu, 15 Mar 2018 07:49:24 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 21D2F1208F71; Thu, 15 Mar 2018 07:49:21 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Thu, 15 Mar 2018 08:49:05 +0100 Message-Id: <1521100145-15304-4-git-send-email-thuth@redhat.com> In-Reply-To: <1521100145-15304-1-git-send-email-thuth@redhat.com> References: <1521100145-15304-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 15 Mar 2018 07:49:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 15 Mar 2018 07:49:24 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 3/3] tests/cdrom-test: Test that -cdrom parameter is working 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: Peter Maydell , Victor Kaplansky , qemu-block@nongnu.org, "Michael S. Tsirkin" , Mark Cave-Ayland , qemu-s390x@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= 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" Commit 1454509726719e0933c800 recently broke the "-cdrom" parameter on a couple of boards without that we noticed it immediately. Thus add a test which checks that "-cdrom" can at least be used to start QEMU with certain machine types. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/Makefile.include | 7 +++++- tests/cdrom-test.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++= +++- 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index a104222..b744fea 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -321,8 +321,9 @@ check-qtest-microblaze-y =3D tests/boot-serial-test$(EX= ESUF) check-qtest-mips-y =3D tests/endianness-test$(EXESUF) =20 check-qtest-mips64-y =3D tests/endianness-test$(EXESUF) +check-qtest-mips64-y +=3D tests/cdrom-test$(EXESUF) =20 -check-qtest-mips64el-y =3D tests/endianness-test$(EXESUF) +check-qtest-mips64el-y =3D $(check-qtest-mips64-y) =20 check-qtest-moxie-y =3D tests/boot-serial-test$(EXESUF) =20 @@ -356,6 +357,7 @@ check-qtest-ppc64-y +=3D tests/display-vga-test$(EXESUF) check-qtest-ppc64-y +=3D tests/numa-test$(EXESUF) check-qtest-ppc64-$(CONFIG_IVSHMEM) +=3D tests/ivshmem-test$(EXESUF) check-qtest-ppc64-y +=3D tests/cpu-plug-test$(EXESUF) +check-qtest-ppc64-y +=3D tests/cdrom-test$(EXESUF) =20 check-qtest-sh4-y =3D tests/endianness-test$(EXESUF) =20 @@ -365,10 +367,12 @@ check-qtest-sparc-y =3D tests/prom-env-test$(EXESUF) check-qtest-sparc-y +=3D tests/m48t59-test$(EXESUF) gcov-files-sparc-y =3D hw/timer/m48t59.c check-qtest-sparc-y +=3D tests/boot-serial-test$(EXESUF) +check-qtest-sparc-y +=3D tests/cdrom-test$(EXESUF) =20 check-qtest-sparc64-y =3D tests/endianness-test$(EXESUF) check-qtest-sparc64-y +=3D tests/prom-env-test$(EXESUF) check-qtest-sparc64-y +=3D tests/boot-serial-test$(EXESUF) +check-qtest-sparc64-y +=3D tests/cdrom-test$(EXESUF) =20 check-qtest-arm-y =3D tests/tmp105-test$(EXESUF) check-qtest-arm-y +=3D tests/ds1338-test$(EXESUF) @@ -384,6 +388,7 @@ check-qtest-arm-y +=3D tests/sdhci-test$(EXESUF) check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) check-qtest-aarch64-y +=3D tests/sdhci-test$(EXESUF) check-qtest-aarch64-y +=3D tests/boot-serial-test$(EXESUF) +check-qtest-aarch64-y +=3D tests/cdrom-test$(EXESUF) =20 check-qtest-microblazeel-y =3D $(check-qtest-microblaze-y) =20 diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c index 1fc5230..5e516dd 100644 --- a/tests/cdrom-test.c +++ b/tests/cdrom-test.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "boot-sector.h" +#include "qapi/qmp/qdict.h" =20 static char isoimage[] =3D "cdrom-boot-iso-XXXXXX"; =20 @@ -62,7 +63,13 @@ static int prepare_image(const char *arch, char *isoimag= e) goto cleanup; } } else { - g_assert_not_reached(); + /* Just create a dummy file */ + char txt[] =3D "empty disc"; + codefile =3D g_strdup_printf("%s/readme.txt", srcdir); + if (!g_file_set_contents(codefile, txt, sizeof(txt) - 1, NULL)) { + fprintf(stderr, "Failed to create '%s'\n", codefile); + goto cleanup; + } } =20 ret =3D gen_iso("-quiet -l -no-emul-boot -b %s -o %s %s", @@ -81,6 +88,32 @@ cleanup: return ret; } =20 +/** + * Check that at least the -cdrom parameter is basically working, i.e. we = can + * see the filename of the ISO image in the output of "info block" afterwa= rds + */ +static void test_cdrom_param(gconstpointer data) +{ + QTestState *qts; + char *resp; + + qts =3D qtest_startf("-M %s -cdrom %s", (const char *)data, isoimage); + resp =3D qtest_hmp(qts, "info block"); + g_assert(strstr(resp, isoimage) !=3D 0); + g_free(resp); + qtest_quit(qts); +} + +static void add_cdrom_param_tests(const char **machines) +{ + while (*machines) { + char *testname =3D g_strdup_printf("cdrom/param/%s", *machines); + qtest_add_data_func(testname, *machines, test_cdrom_param); + g_free(testname); + machines++; + } +} + static void test_cdboot(gconstpointer data) { QTestState *qts; @@ -145,6 +178,34 @@ int main(int argc, char **argv) add_x86_tests(); } else if (g_str_equal(arch, "s390x")) { add_s390x_tests(); + } else if (g_str_equal(arch, "ppc64")) { + const char *ppcmachines[] =3D { + "pseries", "mac99", "g3beige", "40p", "prep", NULL + }; + add_cdrom_param_tests(ppcmachines); + } else if (g_str_equal(arch, "sparc")) { + const char *sparcmachines[] =3D { + "LX", "SPARCClassic", "SPARCbook", "SS-10", "SS-20", "SS-4", + "SS-5", "SS-600MP", "Voyager", "leon3_generic", NULL + }; + add_cdrom_param_tests(sparcmachines); + } else if (g_str_equal(arch, "sparc64")) { + const char *sparc64machines[] =3D { + "niagara", "sun4u", "sun4v", NULL + }; + add_cdrom_param_tests(sparc64machines); + } else if (!strncmp(arch, "mips64", 6)) { + const char *mips64machines[] =3D { + "magnum", "malta", "mips", "mipssim", "pica61", NULL + }; + add_cdrom_param_tests(mips64machines); + } else if (g_str_equal(arch, "aarch64")) { + const char *aarch64machines[] =3D { + "realview-eb", "realview-eb-mpcore", "realview-pb-a8", + "realview-pbx-a9", "versatileab", "versatilepb", "vexpress-a15= ", + "vexpress-a9", "virt", NULL + }; + add_cdrom_param_tests(aarch64machines); } =20 ret =3D g_test_run(); --=20 1.8.3.1