From nobody Fri Nov 22 19:34:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1715868017920102.06799170168813; Thu, 16 May 2024 07:00:17 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.723366.1128226 (Exim 4.92) (envelope-from ) id 1s7beD-0000A1-20; Thu, 16 May 2024 13:59:53 +0000 Received: by outflank-mailman (output) from mailman id 723366.1128226; Thu, 16 May 2024 13:59:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7beC-000096-Ok; Thu, 16 May 2024 13:59:52 +0000 Received: by outflank-mailman (input) for mailman id 723366; Thu, 16 May 2024 13:59:50 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7beA-0006bS-EW for xen-devel@lists.xenproject.org; Thu, 16 May 2024 13:59:50 +0000 Received: from fout8-smtp.messagingengine.com (fout8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8f468cfc-138c-11ef-909d-e314d9c70b13; Thu, 16 May 2024 15:59:49 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.nyi.internal (Postfix) with ESMTP id 0F07D13803A4; Thu, 16 May 2024 09:59:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 16 May 2024 09:59:49 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 May 2024 09:59:47 -0400 (EDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8f468cfc-138c-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1715867989; x=1715954389; bh=neWLSYtrwE 5oJ6YyyAYbJGxLAujbQDz+IR1NVL0iM3w=; b=R25Te2hxyjQXXz6SNJaBblO2sZ PJb7NAWjSbryuR3D/6jNbC/Q4OHo02DtHIUpW3eU60r8b8fl0XRB4/X6kB3CpV5n 8yST4bI0zfYAsexvbuW/MqaJdkQGdyOvE3hr0OYNGZSCQdsMR0jLvJqkj4SHt6ck /0Tuo6eDsvPN5e7t8HVdIexEXcq/GVPu1OERzFrEXLX02miR9ZbgSsEqIvLVkk4T ZLj3LlBjUhZXiJXVKkxucVTSuyhTXB/+OmuNBp2n9lj1EDCbjGTPryL04RXB2N7q aaa3HpI0+k3R/t6tSertGzb2j6sOPY3w58MD3RKta/AQSlW/Vwm5yqA5rnWA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1715867989; x= 1715954389; bh=neWLSYtrwE5oJ6YyyAYbJGxLAujbQDz+IR1NVL0iM3w=; b=T qrNwIAbphsbDC2cHlgh1nEhVghfdWyDHWyRe8jp9gnHiMjfMy+THePOxfVqg0jGh JXpy3HUcM7UVkZe4+63IjwCek2SVRE8junLognkckSFaFuKfzcQ9Cd1fkhDLq8Ej 3It5xlXSg5c5R6f97JwbsawvxAEpsQb5twJE9F0SwAMLfSrhBuYmR/mtNW+pqDw/ hRsiHZwk6Bw1uTntwM288ciyoWyXIPKm+B8o4B+jqplqa5vZDUNd/8WCWInWRa4X +vddsbJLhtHcHZD7Ha60slxCYfi2HfXUe3KrL6rALtvKbY4f3tiUraizWE03/aPj xgkxhbL9DvgIPq7ECMXag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdehuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 10/12] automation: stubdom test with PCI passthrough Date: Thu, 16 May 2024 15:58:31 +0200 Message-ID: <16c7001cfec1cb7a601414b745655656ea63fe29.1715867907.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1715868018280100002 Based on the initial stubdomain test and existing PCI passthrough tests, add one that combines both. Schedule it on the AMD runner, as it has less tests right now. Signed-off-by: Marek Marczykowski-G=C3=B3recki Acked-by: Stefano Stabellini --- automation/gitlab-ci/test.yaml | 8 ++++++++ automation/scripts/qubes-x86-64.sh | 30 +++++++++++++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index e3910f4c1a9f..76cc430ae00f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -231,6 +231,14 @@ zen3p-pci-hvm-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.19-gcc-debug =20 +zen3p-pci-stubdom-x86-64-gcc-debug: + extends: .zen3p-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-stubdom 2>&1 | tee ${LOGFIL= E} + needs: + - *x86-64-test-needs + - alpine-3.19-gcc-debug + qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 script: diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index fc73403dbadf..816c16fbab3e 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -98,8 +98,8 @@ ping -c 10 192.168.0.2 || exit 1 echo \"${passed}\" " =20 -### test: pci-pv, pci-hvm -elif [ "${test_variant}" =3D "pci-pv" ] || [ "${test_variant}" =3D "pci-hv= m" ]; then +### test: pci-pv, pci-hvm, pci-stubdom +elif [ "${test_variant}" =3D "pci-pv" ] || [ "${test_variant}" =3D "pci-hv= m" ] || [ "${test_variant}" =3D "pci-stubdom" ]; then =20 if [ -z "$PCIDEV" ]; then echo "Please set 'PCIDEV' variable with BDF of test network adapte= r" >&2 @@ -109,15 +109,35 @@ elif [ "${test_variant}" =3D "pci-pv" ] || [ "${test_= variant}" =3D "pci-hvm" ]; then =20 passed=3D"pci test passed" =20 - domU_config=3D' + domain_type=3D"${test_variant#pci-}" + if [ "$test_variant" =3D "pci-stubdom" ]; then + domain_type=3D"hvm" + domU_config=3D' +type =3D "hvm" +disk =3D [ "/srv/disk.img,format=3Draw,vdev=3Dxvda" ] +device_model_version =3D "qemu-xen" +device_model_stubdomain_override =3D 1 +on_reboot =3D "destroy" +# libxl configures vkb backend to be dom0 instead of the stubdomain, defer +# changing that until there is consensus what to do about VGA output (VNC) +vkb_device =3D 0 +' + domU_disk_path=3D/srv/disk.img + else + domU_config=3D' type =3D "'${test_variant#pci-}'" -name =3D "domU" kernel =3D "/boot/vmlinuz" ramdisk =3D "/boot/initrd-domU" extra =3D "root=3D/dev/ram0 console=3Dhvc0 earlyprintk=3Dxen" +disk =3D [ ] +' + fi + + # common part + domU_config=3D"$domU_config"' +name =3D "domU" memory =3D 512 vif =3D [ ] -disk =3D [ ] pci =3D [ "'$PCIDEV',seize=3D1" ] on_reboot =3D "destroy" ' --=20 git-series 0.9.1