{"id":807748,"url":"http://patchwork.ozlabs.org/api/patches/807748/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-7-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830165252.13421-7-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:14","name":"[PULL,06/44] tests/pxe: Check virtio-net-ccw on s390x","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ff38e8293e7ea8d9ed7c6568d6329b2a0db78898","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-7-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807748/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807748/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjBlM1y6fz9sNn\n\tfor ;\n\tThu, 31 Aug 2017 03:07:43 +1000 (AEST)","from localhost ([::1]:51683 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6Sq-0005yr-Vk\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:07:41 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:56465)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6F5-0001Vn-1i\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6F3-00051x-WB\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:27 -0400","from mx1.redhat.com ([209.132.183.28]:35276)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6F3-00051V-Nz\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:25 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id A8DB75F7AD;\n\tWed, 30 Aug 2017 16:53:24 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 2EAD370944;\n\tWed, 30 Aug 2017 16:53:21 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A8DB75F7AD","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:14 +0200","Message-Id":"<20170830165252.13421-7-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 30 Aug 2017 16:53:24 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 06/44] 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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Thomas Huth \n\nNow that we've got a firmware that can do TFTP booting on s390x (i.e.\nthe pc-bios/s390-netboot.img), we can enable the PXE tester for this\narchitecture, too.\n\nSigned-off-by: Thomas Huth \nReviewed-by: Cornelia Huck \nMessage-Id: <1502431076-22849-3-git-send-email-thuth@redhat.com>\nSigned-off-by: Cornelia Huck \n---\n tests/Makefile.include | 1 +\n tests/boot-sector.c | 20 ++++++++++++++++++++\n tests/pxe-test.c | 7 +++++++\n 3 files changed, 28 insertions(+)","diff":"diff --git a/tests/Makefile.include b/tests/Makefile.include\nindex 37c1bed683..ea0f15f70b 100644\n--- a/tests/Makefile.include\n+++ b/tests/Makefile.include\n@@ -360,6 +360,7 @@ check-qtest-microblazeel-y = $(check-qtest-microblaze-y)\n check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)\n \n check-qtest-s390x-y = tests/boot-serial-test$(EXESUF)\n+check-qtest-s390x-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)\n \n check-qtest-generic-y += tests/qom-test$(EXESUF)\n check-qtest-generic-y += tests/test-hmp$(EXESUF)\ndiff --git a/tests/boot-sector.c b/tests/boot-sector.c\nindex 87295624d2..9ee85370b0 100644\n--- a/tests/boot-sector.c\n+++ b/tests/boot-sector.c\n@@ -67,6 +67,21 @@ static uint8_t x86_boot_sector[512] = {\n [0x1FF] = 0xAA,\n };\n \n+/* For s390x, use a mini \"kernel\" with the appropriate signature */\n+static const uint8_t s390x_psw[] = {\n+ 0x00, 0x08, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00\n+};\n+static const uint8_t s390x_code[] = {\n+ 0xa7, 0xf4, 0x00, 0x0a, /* j 0x10010 */\n+ 0x00, 0x00, 0x00, 0x00,\n+ 'S', '3', '9', '0',\n+ 'E', 'P', 0x00, 0x01,\n+ 0xa7, 0x38, HIGH(SIGNATURE_ADDR), LOW(SIGNATURE_ADDR), /* lhi r3,0x7c10 */\n+ 0xa7, 0x48, LOW(SIGNATURE), HIGH(SIGNATURE), /* lhi r4,0xadde */\n+ 0x40, 0x40, 0x30, 0x00, /* sth r4,0(r3) */\n+ 0xa7, 0xf4, 0xff, 0xfa /* j 0x10010 */\n+};\n+\n /* Create boot disk file. */\n int boot_sector_init(char *fname)\n {\n@@ -92,6 +107,11 @@ int boot_sector_init(char *fname)\n LOW(SIGNATURE), SIGNATURE_ADDR,\n HIGH(SIGNATURE), SIGNATURE_ADDR + 1);\n len = strlen(boot_code);\n+ } else if (g_str_equal(arch, \"s390x\")) {\n+ len = 0x10000 + sizeof(s390x_code);\n+ boot_code = g_malloc0(len);\n+ memcpy(boot_code, s390x_psw, sizeof(s390x_psw));\n+ memcpy(&boot_code[0x10000], s390x_code, sizeof(s390x_code));\n } else {\n g_assert_not_reached();\n }\ndiff --git a/tests/pxe-test.c b/tests/pxe-test.c\nindex cf6e225330..0d70afccd6 100644\n--- a/tests/pxe-test.c\n+++ b/tests/pxe-test.c\n@@ -51,6 +51,11 @@ static void test_pxe_spapr_vlan(void)\n test_pxe_one(\"-device spapr-vlan,netdev=\" NETNAME, true);\n }\n \n+static void test_pxe_virtio_ccw(void)\n+{\n+ test_pxe_one(\"-device virtio-net-ccw,bootindex=1,netdev=\" NETNAME, false);\n+}\n+\n int main(int argc, char *argv[])\n {\n int ret;\n@@ -68,6 +73,8 @@ int main(int argc, char *argv[])\n } else if (strcmp(arch, \"ppc64\") == 0) {\n qtest_add_func(\"pxe/virtio\", test_pxe_virtio_pci);\n qtest_add_func(\"pxe/spapr-vlan\", test_pxe_spapr_vlan);\n+ } else if (g_str_equal(arch, \"s390x\")) {\n+ qtest_add_func(\"pxe/virtio-ccw\", test_pxe_virtio_ccw);\n }\n ret = g_test_run();\n boot_sector_cleanup(disk);\n","prefixes":["PULL","06/44"]}