From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 92E83C88E6F for ; Mon, 14 Sep 2026 19:35:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6CSf-0007K6-ID; Mon, 14 Sep 2026 15:35:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6CSE-00070f-3M; Mon, 14 Sep 2026 15:35:04 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6CSB-0004H1-JV; Mon, 14 Sep 2026 15:35:01 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68EJ1dGK2739123; Mon, 14 Sep 2026 19:34:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=t/y/vTQBtlIWi2+w7 VEwIBur1cVx13Tpa7RfgWXb4C4=; b=naAVloSQKxa2qcglTXKK4WDp+xowBrsG+ /SXbKA5sYkEbRbZX9eoHx3pU9I9DLZQ2fErOHFIXtIr8hHofMGmLf5AIVDxN2Jkw /cI7ug7uu58GIL6qiLn47+mzpxNhTxY+hBB81T5gvQILSM0paN0oocVgXCZAWajG qIOW5sInLpygqztPsv1nOHKlISdI+wNsn9TdKpMFJZ+zLNFZR4QVb+dQ9Yn1t8Mr ahkMVRh6+y8wTqvlAuP5DFXvMVutD9UvRomU42CdLNfSl1TGmtpxpFvFJTnjQWWp JMc72uM36qAMbG0m2xlAZJpOMivYXpHK12GTAj6idBLcyvYHZImQw== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4gmv5hkp5g-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 14 Sep 2026 19:34:58 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68EIoov92817784; Mon, 14 Sep 2026 19:34:57 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gnk9j7ny5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Sep 2026 19:34:57 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68EJYthT20251338 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Sep 2026 19:34:55 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CB33858059; Mon, 14 Sep 2026 19:34:55 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6273C58058; Mon, 14 Sep 2026 19:34:54 +0000 (GMT) Received: from fedora-workstation.ibmuc.com (unknown [9.61.78.15]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 14 Sep 2026 19:34:54 +0000 (GMT) From: Zhuoying Cai To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org Cc: mst@redhat.com, jrossi@linux.ibm.com, zycai@linux.ibm.com, borntraeger@linux.ibm.com, jjherne@linux.ibm.com, cohuck@redhat.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, pasic@linux.ibm.com, farosas@suse.de, lvivier@redhat.com, pbonzini@redhat.com, jdaley@linux.ibm.com Subject: [PATCH v3 8/8] tests/functional/s390x: Add tests for virtio net PCI in test_pxelinux.py Date: Mon, 14 Sep 2026 15:34:38 -0400 Message-ID: <20260914193438.526407-9-zycai@linux.ibm.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260914193438.526407-1-zycai@linux.ibm.com> References: <20260914193438.526407-1-zycai@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTE0MDI3OCBTYWx0ZWRfX0FjatxyChID9 T2xpAZrZsbplI8YW7pODM93sQvuQOyf4pY79t+Bt39RNc/K3AQ92yyQS8gZYWyitsALGB8o4zn1 x8GBjOFUiUGkFmqstepouxXozcd/P8eMgdYuLsAeZ3HfzceQlVR9td2m2UVGP8ubKAySvRM3uNl s+JnFMjq9YSM2GBQ1slWBUgC1Lmg+Il3DbsswWxCSptwjpyhtnKu79j8n1sS2toJ29+PUjav5zu hWdaDuWck7pbPH4BQ292uQtzP+X+fDcO8TFg4qqs9+lLfxh+8tooW00XwW9kJ9S67zAaVdztAh0 KINqxpxX2meGgRihRTPSNbsHZPvrKR04hA/1S0aBfujgC7XuSjx6NNtAqIu/K9Diumfo+EYVc55 aLRPCWGujaSLj0Wxvtq//ZZDhZpyYhOr2a8I+6SINKbQFIWOu0O4vsQm163Ma9STdgm4GUu4C3I SH65AGrWzN0QkH82Fyw== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTE0MDI3OCBTYWx0ZWRfX7ty612x0l7PN yb+gmi7bGr2qIRnjkfGj9JzRNf83urNsdIk1fV3z56/U5g5dhIHmkGiJ+S4Z7zvhgUV2XQlDqkf AKC/Ocu/qxrgFaAmsYxp6/75xDDHgdM= X-Authority-Analysis: v=2.4 cv=Zsx4uN7G c=1 sm=1 tr=0 ts=6aa84c62 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=Z6bpV0tWmYslb40Kif8A:9 X-Proofpoint-ORIG-GUID: P5W7KAmREs5HKvQDcrv-BafTm_lxcwrc X-Proofpoint-GUID: P5W7KAmREs5HKvQDcrv-BafTm_lxcwrc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-14_03,2026-09-14_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609140278 Received-SPF: pass client-ip=148.163.158.5; envelope-from=zycai@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add test coverage for virtio-net-pci network booting on s390x by extending the pxelinux functional tests. This patch adds PCI variants of all existing pxelinux tests to verify that virtio-net-pci devices work correctly for network booting. Signed-off-by: Zhuoying Cai Tested-by: Joshua Daley --- tests/functional/s390x/test_pxelinux.py | 71 ++++++++++++++++++++----- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/tests/functional/s390x/test_pxelinux.py b/tests/functional/s390x/test_pxelinux.py index c00cce6a5a..7223364852 100755 --- a/tests/functional/s390x/test_pxelinux.py +++ b/tests/functional/s390x/test_pxelinux.py @@ -50,7 +50,8 @@ class S390PxeLinux(QemuSystemTest): '/images/kernel.img'), '480859574f3f44caa6cd35c62d70e1ac0609134e22ce2a954bbed9b110c06e0b') - def pxelinux_launch(self, pl_name='default', extra_opts=None): + def pxelinux_launch(self, pl_name='default', extra_opts=None, + dev='virtio-net-ccw'): '''Create a pxelinux.cfg file in the right location and launch QEMU''' self.require_netdev('user') self.set_machine('s390-ccw-virtio') @@ -74,7 +75,7 @@ def pxelinux_launch(self, pl_name='default', extra_opts=None): with open(cfg_fname, 'w', encoding='utf-8') as f: f.write(PXELINUX_CFG_CONTENTS) - virtio_net_dev = 'virtio-net-ccw,netdev=n1,bootindex=1' + virtio_net_dev = f'{dev},netdev=n1,bootindex=1' if extra_opts: virtio_net_dev += ',' + extra_opts @@ -85,9 +86,9 @@ def pxelinux_launch(self, pl_name='default', extra_opts=None): self.vm.launch() - def test_default(self): + def do_test_default(self, dev): '''Check whether the guest uses the "default" file name''' - self.pxelinux_launch() + self.pxelinux_launch(dev=dev) # The kernel prints its arguments to the console, so we can use # this to check whether the kernel parameters are correctly handled: wait_for_console_pattern(self, 'testoption=teststring') @@ -95,36 +96,82 @@ def test_default(self): wait_for_console_pattern(self, 'Unpacking initramfs...') wait_for_console_pattern(self, 'Run /init as init process') - def test_mac(self): + def do_test_mac(self, dev): '''Check whether the guest uses file name based on its MAC address''' self.pxelinux_launch(pl_name='01-02-ca-fe-ba-be-42', - extra_opts='mac=02:ca:fe:ba:be:42,loadparm=3') + extra_opts='mac=02:ca:fe:ba:be:42,loadparm=3', + dev=dev) wait_for_console_pattern(self, 'Linux version 5.3.7-301.fc31.s390x') - def test_uuid(self): + def do_test_uuid(self, dev): '''Check whether the guest uses file name based on its UUID''' # Also add a non-bootable disk to check the fallback to network boot: self.vm.add_args('-blockdev', 'null-co,size=65536,node-name=d1', '-device', 'virtio-blk,drive=d1,bootindex=0,loadparm=1', '-uuid', '550e8400-e29b-11d4-a716-446655441234') - self.pxelinux_launch(pl_name='550e8400-e29b-11d4-a716-446655441234') + self.pxelinux_launch(pl_name='550e8400-e29b-11d4-a716-446655441234', + dev=dev) wait_for_console_pattern(self, 'Debian 4.19.146-1 (2020-09-17)') - def test_ip(self): + def do_test_ip(self, dev): '''Check whether the guest uses file name based on its IP address''' self.vm.add_args('-M', 'loadparm=3') - self.pxelinux_launch(pl_name='0A00020F') + self.pxelinux_launch(pl_name='0A00020F', dev=dev) wait_for_console_pattern(self, 'Linux version 5.3.7-301.fc31.s390x') - def test_menu(self): + def do_test_menu(self, dev): '''Check whether the boot menu works for pxelinux.cfg booting''' self.vm.add_args('-boot', 'menu=on,splash-time=10') - self.pxelinux_launch(pl_name='0A00') + self.pxelinux_launch(pl_name='0A00', dev=dev) wait_for_console_pattern(self, '[1] Nonexisting') wait_for_console_pattern(self, '[2] Debian') wait_for_console_pattern(self, '[3] Fedora') wait_for_console_pattern(self, 'Debian 4.19.146-1 (2020-09-17)') + def test_default(self): + '''pxelinux.cfg "default" lookup via virtio-net-ccw''' + self.do_test_default('virtio-net-ccw') + + def test_default_pci(self): + '''pxelinux.cfg "default" lookup via virtio-net-pci''' + self.require_device('virtio-net-pci') + self.do_test_default('virtio-net-pci') + + def test_mac(self): + '''pxelinux.cfg MAC-address-based file lookup via virtio-net-ccw''' + self.do_test_mac('virtio-net-ccw') + + def test_mac_pci(self): + '''pxelinux.cfg MAC-address-based file lookup via virtio-net-pci''' + self.require_device('virtio-net-pci') + self.do_test_mac('virtio-net-pci') + + def test_uuid(self): + '''pxelinux.cfg UUID-based file lookup via virtio-net-ccw''' + self.do_test_uuid('virtio-net-ccw') + + def test_uuid_pci(self): + '''pxelinux.cfg UUID-based file lookup via virtio-net-pci''' + self.require_device('virtio-net-pci') + self.do_test_uuid('virtio-net-pci') + + def test_ip(self): + '''pxelinux.cfg IP-address-based file lookup via virtio-net-ccw''' + self.do_test_ip('virtio-net-ccw') + + def test_ip_pci(self): + '''pxelinux.cfg IP-address-based file lookup via virtio-net-pci''' + self.require_device('virtio-net-pci') + self.do_test_ip('virtio-net-pci') + + def test_menu(self): + '''pxelinux.cfg interactive boot menu via virtio-net-ccw''' + self.do_test_menu('virtio-net-ccw') + + def test_menu_pci(self): + '''pxelinux.cfg interactive boot menu via virtio-net-pci''' + self.require_device('virtio-net-pci') + self.do_test_menu('virtio-net-pci') if __name__ == '__main__': QemuSystemTest.main() -- 2.55.0