From nobody Sat Apr 27 13:00:25 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501767084186614.2695202712279; Thu, 3 Aug 2017 06:31:24 -0700 (PDT) Received: from localhost ([::1]:43022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddGDi-0000oq-Cq for importer@patchew.org; Thu, 03 Aug 2017 09:31:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddGCs-0000SY-8p for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:30:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddGCo-0003ad-BL for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:30:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddGCo-0003ZT-2R for qemu-devel@nongnu.org; Thu, 03 Aug 2017 09:30:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ACA93C04B927; Thu, 3 Aug 2017 13:30:24 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-117-212.ams2.redhat.com [10.36.117.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25A1278907; Thu, 3 Aug 2017 13:30:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ACA93C04B927 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=thuth@redhat.com From: Thomas Huth To: qemu-devel@nongnu.org, Cornelia Huck Date: Thu, 3 Aug 2017 15:30:19 +0200 Message-Id: <1501767019-4989-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 03 Aug 2017 13:30:24 +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] tests/pxe: Check virtio-net-ccw on s390x 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: Christian Borntraeger , Jason Wang , Victor Kaplansky , "Michael S. Tsirkin" 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" Now that we've got a firmware that can do TFTP booting on s390x (i.e. the pc-bios/s390-netboot.img), we can enable the PXE tester for this architecture, too. Signed-off-by: Thomas Huth --- Since this only adds a test, I guess this could still be included for 2.10 ... otherwise, I think it's also OK to simply postpone this to 2.11 instead =20 tests/Makefile.include | 1 + tests/boot-sector.c | 25 ++++++++++++++++++++++--- tests/pxe-test.c | 7 +++++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 59e536b..f9af5e3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -337,6 +337,7 @@ check-qtest-microblazeel-y =3D $(check-qtest-microblaze= -y) check-qtest-xtensaeb-y =3D $(check-qtest-xtensa-y) =20 check-qtest-s390x-y =3D tests/boot-serial-test$(EXESUF) +check-qtest-s390x-y +=3D tests/pxe-test$(EXESUF) =20 check-qtest-generic-y +=3D tests/qom-test$(EXESUF) check-qtest-generic-y +=3D tests/test-hmp$(EXESUF) diff --git a/tests/boot-sector.c b/tests/boot-sector.c index e3880f4..87a8fb5 100644 --- a/tests/boot-sector.c +++ b/tests/boot-sector.c @@ -21,6 +21,7 @@ #define SIGNATURE 0xdead #define SIGNATURE_OFFSET 0x10 #define BOOT_SECTOR_ADDRESS 0x7c00 +#define SIGNATURE_ADDR (BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET) =20 /* Boot sector code: write SIGNATURE into memory, * then halt. @@ -73,6 +74,7 @@ int boot_sector_init(char *fname) { int fd, ret; size_t len =3D sizeof boot_sector; + const char *arch =3D qtest_get_arch(); =20 fd =3D mkstemp(fname); if (fd < 0) { @@ -81,10 +83,27 @@ int boot_sector_init(char *fname) } =20 /* For Open Firmware based system, we can use a Forth script instead */ - if (strcmp(qtest_get_arch(), "ppc64") =3D=3D 0) { + if (g_str_equal(arch, "ppc64")) { len =3D sprintf((char *)boot_sector, "\\ Bootscript\n%x %x c! %x %= x c!\n", - LOW(SIGNATURE), BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET, - HIGH(SIGNATURE), BOOT_SECTOR_ADDRESS + SIGNATURE_OFFSET + = 1); + LOW(SIGNATURE), SIGNATURE_ADDR, + HIGH(SIGNATURE), SIGNATURE_ADDR + 1); + } else if (g_str_equal(arch, "s390x")) { + /* For s390x, fake a kernel signature */ + const uint8_t psw[] =3D { + 0x00, 0x08, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00 + }; + const uint8_t code[] =3D { + 0xa7, 0xf4, 0x00, 0x0a, /* j 0x10010 */ + 0x00, 0x00, 0x00, 0x00, + 'S', '3', '9', '0', + 'E', 'P', 0x00, 0x01, + 0xa7, 0x38, HIGH(SIGNATURE_ADDR), LOW(SIGNATURE_ADDR), /* lhi = r3 */ + 0xa7, 0x48, LOW(SIGNATURE), HIGH(SIGNATURE), /* lhi r4,0xad= de */ + 0x40, 0x40, 0x30, 0x00, /* sth r4,0(r3) */ + 0xa7, 0xf4, 0xff, 0xfa /* j 0x10010 */ + }; + memcpy(boot_sector, psw, 8); + memcpy(&boot_sector[0x10000], code, sizeof(code)); } =20 ret =3D write(fd, boot_sector, len); diff --git a/tests/pxe-test.c b/tests/pxe-test.c index cf6e225..0d70afc 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -51,6 +51,11 @@ static void test_pxe_spapr_vlan(void) test_pxe_one("-device spapr-vlan,netdev=3D" NETNAME, true); } =20 +static void test_pxe_virtio_ccw(void) +{ + test_pxe_one("-device virtio-net-ccw,bootindex=3D1,netdev=3D" NETNAME,= false); +} + int main(int argc, char *argv[]) { int ret; @@ -68,6 +73,8 @@ int main(int argc, char *argv[]) } else if (strcmp(arch, "ppc64") =3D=3D 0) { qtest_add_func("pxe/virtio", test_pxe_virtio_pci); qtest_add_func("pxe/spapr-vlan", test_pxe_spapr_vlan); + } else if (g_str_equal(arch, "s390x")) { + qtest_add_func("pxe/virtio-ccw", test_pxe_virtio_ccw); } ret =3D g_test_run(); boot_sector_cleanup(disk); --=20 1.8.3.1