From nobody Fri Oct 31 09:32:01 2025 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; dkim=pass; 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; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1747935430; cv=none; d=zohomail.com; s=zohoarc; b=ZxEwvWwYevKS98iTBf7NuLZJg+NG9MkfofIFEQM4T50g0Mz6wETDpzJsUw5TbwVNDts0D7N5jMVRl2sLeu+DaDdkxdkIZyKzNmbUE6ZaNcbJ2g+pZQmPAJR/Z6aRU2f8qpi3o5vlnu5P7wgSoEkfp+/Je+m0Hwn7Jbcv08H3D+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747935430; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lTQLVGcychOhPHjn+s3ORj8cl5Yx5oWPYxlLPQZX4qE=; b=Caywuuf45WlEbr7YMIn3R22zTuMylgJ4NquEF/x+I581bqA/3HC6RMgiMniq7TinZljKpOfrIG8E7aqerdoMiW5Ao9ZZaLderJWI9Tg77TKlZsj8Q3BCYT0DwOPGjNke/UXJa71AT9i7/jX78WwLK9gDkTlSitheIA9pArX2ywU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1747935430694897.0265801717252; Thu, 22 May 2025 10:37:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.994480.1377460 (Exim 4.92) (envelope-from ) id 1uI9qa-0003dC-2b; Thu, 22 May 2025 17:36:48 +0000 Received: by outflank-mailman (output) from mailman id 994480.1377460; Thu, 22 May 2025 17:36:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI9qZ-0003bB-SD; Thu, 22 May 2025 17:36:47 +0000 Received: by outflank-mailman (input) for mailman id 994480; Thu, 22 May 2025 17:36:46 +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 1uI9qY-0003Za-Km for xen-devel@lists.xenproject.org; Thu, 22 May 2025 17:36:46 +0000 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [2a00:1450:4864:20::533]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 54a20982-3733-11f0-a2fb-13f23c93f187; Thu, 22 May 2025 19:36:45 +0200 (CEST) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-601aa0cb92eso7322829a12.0 for ; Thu, 22 May 2025 10:36:45 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d442069sm1116063366b.103.2025.05.22.10.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:36:43 -0700 (PDT) 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: 54a20982-3733-11f0-a2fb-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1747935404; x=1748540204; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lTQLVGcychOhPHjn+s3ORj8cl5Yx5oWPYxlLPQZX4qE=; b=a63EIgYNicZo4Xeey+MhEaGzhbKmCrmU7QZUjp0KZqbVL0TrLSo9zoejsMQjpqh8r5 QR4Cxb7jGH4YiirEqWWeONUYCH8O+3I952YEfuw0zJh2CXtjL/A5mMoyvMqm3tHnaWTJ TNF4+KjLAStzOcGwEnHHBhH4EiEvQRzvNvf/w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747935404; x=1748540204; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lTQLVGcychOhPHjn+s3ORj8cl5Yx5oWPYxlLPQZX4qE=; b=b5wtsZ9ZGZ9N6073C7fk3twkucO+5hha/0hWjMNtSduv0QfefpacuZSrJmsv4/ELTb DAwF+5YB048O6YxCMnO/i55RYOConmOBolAuVOOdFwwDMvTQGvLW6emZpLbNjDdqJJkI AnM3LLnmS6E7ZyLAzb2b/mly0K5CoJpar0s0So3V9rvbUaEUlVYifMS+Z34d/fIXLjmZ BRKMQcV62zgxVMXuD3WDlB9TYjuVqKFc2R3+sbelDgyB0Ktta5gRZpNpMvh+dFrFe87W 5xACaCIKPzAw+vn+T4D+HruizMRWZqsRXSuD+sbHEGQkKOznALQ2Bh9g0C5c9B7IOyqO GocA== X-Gm-Message-State: AOJu0Yz8a7IzUv55aPGfngxnE/wB86rNioXi+O1slJ1KwceJkA7i8rZO XfSMxzJCHfdLg82WFjFbRS1wELrOw/lyZOnIQB9Hl654ttTkwybgz963TMpKM90q5ZsXL8ABVQr 4Clkh X-Gm-Gg: ASbGncvjOjAQesvxpZSCC5owtVS1o3AGXxPSvYQXy6Yf4Uy37OKuuZjVFKJFpzP3Xek S8FTPT33SDC68j0Pf2QpFkGEpeTffSZWTwR1m2tgXEOLKcRNimvsFiboCVtBK3EI36Htm4DeY46 9PkTMhQpfzQj/jae4ZjSLX/3/j+e0q76zjMWOZI9Pz9jDXlnMckamhOPBUUsSE3u6SXm4CvaItz pNhvMGWbjirA7koedcKN69vrDysKNlIO8+UbmtJcgMCNqG3n9wXnP9v0e8yzrDlprPiN7SBA9KT npDDC6hie3ckLZqG+RWtUmrQrYPK5dQndoHgqh5Ju5yzSgmEyYdNg38qWKr/5utbgzj8VeYEyyT cdh6GF52nNM3H8gx1RK0rSDlb X-Google-Smtp-Source: AGHT+IG6wD0gHXecI2/fRDvo/BDNeQHU4TT47xd98TYkH6tVgsPoTHFYWe7u6nAGRyWoez+AnoAwGQ== X-Received: by 2002:a17:906:c408:b0:ad5:4919:6317 with SMTP id a640c23a62f3a-ad549196826mr1543346166b.49.1747935404325; Thu, 22 May 2025 10:36:44 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 1/3] CI/qubes: Deduplicate the handling of ${dom0_check} Date: Thu, 22 May 2025 18:36:38 +0100 Message-Id: <20250522173640.575452-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522173640.575452-1-andrew.cooper3@citrix.com> References: <20250522173640.575452-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1747935432334116600 Make it clear that ${dom0_check} is unconditional. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD Reviewed-by: Stefano Stabellini --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki --- automation/scripts/qubes-x86-64.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index bfdd2ceb99ba..10af274a0ba7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -221,12 +221,11 @@ if [ -n "$domU_check" ]; then tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(do= mU) /\" & tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm)= /\" & xl -vvv create /etc/xen/domU.cfg -${dom0_check} " >> etc/local.d/xen.start -else - echo "${dom0_check}" >> etc/local.d/xen.start fi =20 +echo "${dom0_check}" >> etc/local.d/xen.start + chmod +x etc/local.d/xen.start mkdir -p etc/xen echo "$domU_config" > etc/xen/domU.cfg --=20 2.39.5 From nobody Fri Oct 31 09:32:01 2025 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; dkim=pass; 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; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1747935423; cv=none; d=zohomail.com; s=zohoarc; b=cPEavEGefKWBFZqN/z/EqNVeDjXUIzFSeRlF3Un3TmsciCIHl2/Z47X5VaW3dWFVR7sxr+TKqUantgdRJn0Ftj8TKBhnZxqkihRAGPH+MVlFMp+1s6Yt9tB09PFrtgY6kqTHKdTL9TZeB2o4vCr86w+2bJvGeiVH4RcTey790CY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747935423; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZadyQ1dGPInWsa7+i4u+dOHgUQQBDu0QP3e67vZGDBU=; b=Mt67j31lSHgj7bN2FN2EvjO6B7J0gWZDLhui1dMKQYCpW1y6BNDCUELle+LfURTLLyP9DZmru9GGgwb+jSPMGwtRukQd2QXv6sSPc6WKYO0QH+pDFgYJ02UajIhrIZzCf6L8z6eFycFrXOlFdIXnMCVrrgPJK/Pp+/pCJK0FCLE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17479354236191002.190499690902; Thu, 22 May 2025 10:37:03 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.994482.1377478 (Exim 4.92) (envelope-from ) id 1uI9qb-00043S-EE; Thu, 22 May 2025 17:36:49 +0000 Received: by outflank-mailman (output) from mailman id 994482.1377478; Thu, 22 May 2025 17:36:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI9qb-000432-9f; Thu, 22 May 2025 17:36:49 +0000 Received: by outflank-mailman (input) for mailman id 994482; Thu, 22 May 2025 17:36:47 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI9qZ-0003ZZ-Ll for xen-devel@lists.xenproject.org; Thu, 22 May 2025 17:36:47 +0000 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [2a00:1450:4864:20::52e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 553117a6-3733-11f0-b892-0df219b8e170; Thu, 22 May 2025 19:36:46 +0200 (CEST) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-601c5cd15ecso7805412a12.2 for ; Thu, 22 May 2025 10:36:46 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d442069sm1116063366b.103.2025.05.22.10.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:36:44 -0700 (PDT) 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: 553117a6-3733-11f0-b892-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1747935405; x=1748540205; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZadyQ1dGPInWsa7+i4u+dOHgUQQBDu0QP3e67vZGDBU=; b=c++HdavcNLa4vAnsAAM3dvr6ZZhMV1YwVBErgoWrRvNvYpDwfjYAQjmGI6RXPOf6ct K4aQm8DROpMIW0aZybfusnKDrWTOrxUd/3eNOV3gvK2AFZCrGFfpicViUyZ50BC0oLnx qoQPHzcOQr2O/yeFWAEQlCrUQLgo9ks5P5Tiw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747935405; x=1748540205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZadyQ1dGPInWsa7+i4u+dOHgUQQBDu0QP3e67vZGDBU=; b=tyRsjiovXxbodeqq2EUfDQQTuEBH6T00/D1Gf0Jzn5T5kBc7sFaVw6cxD/fqS5YnhO j9Ef3WfI4DA9vnF0CizEi74+J1sGKfIcJdw1O7wdx/LZkn1JhN29oojfQNbQ0lXnFZIs VzS91rXulXfTWPgnFoYKm7wdoD5I05m5YV9Bi6Sv0UyJCMSnVilM8kx1l2QKWBkR+UdT 9x4Oicll4CpDPeCHySdVb5kw1wHDcTEVCp9Wh+spPk32PWzH2v51QpSihJG+8tDUNSF+ 6wkNexzHlOhe8VnjFFmEcDD0dK1gkGIjcu1GvL876+AkZFe8tPckExTdQ2F6tLBg1wEe nl+A== X-Gm-Message-State: AOJu0YwhXRauIP8om0yV7ddPzEQLWxmvA9mDVEz8wk1NMYXVxLYR7x/j ufIdqZxvgQx/5CcdE76j1SyLpATmyWVTzl5/UbSNBuHgkogV20Q92h0VgTRq1pEuUI8FeP4bQ7j TQ3Em X-Gm-Gg: ASbGncvKZUnRGLu3+LymNOQyp0eugyEpKQW6dL5QxnzBdxIP8HRDx/X9OWoZoxW15hm B2nWUt+BYoKMsXAv7GDgqBxpDc7kvG7JCd9T7YnjoXGmwbhLB8mbmN5zGhQYy1DFJIyiwGshKO2 AEzHqFQ8+p3+INAH2O47NeQXJMR7hO7f9s6l3HnuXfnUjrgU/ZH2G/415ZsnoqhWR/rHbTIehx9 RJ2SM54TUFTIvnoQpMMadocOpNRndqcVwQZjoC7oFSj+ARR161u1pHyiEwz/mgnY/YfIeuYxMRl GvJAZMZb2KPYbzhAVQgsfNyZ817XZyA1fZwqQ2KtuE3t6DOVTa6cQx9P6SfWyRoHrrQJClz2hjD 9P/dLJWXtTPzir+3D9Eweh9w/bD0L2jIEN5Q= X-Google-Smtp-Source: AGHT+IGpajxmUsPPYguIJRowQVROWmkBbc6c75BLnT1q+SBw/DEbc5kCmLDo8Qb2Z9sBZzuuh/yIBw== X-Received: by 2002:a17:907:96a1:b0:ad2:3f54:1834 with SMTP id a640c23a62f3a-ad536dce664mr2444664566b.40.1747935405312; Thu, 22 May 2025 10:36:45 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 2/3] CI: Use bash arrays to simplfy dom0 rootfs construction Date: Thu, 22 May 2025 18:36:39 +0100 Message-Id: <20250522173640.575452-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522173640.575452-1-andrew.cooper3@citrix.com> References: <20250522173640.575452-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1747935424426116600 For Qubes, this requires switching from sh to bash. This reduces the number of times the target filename needs to be written to= 1. Expand the comment to explain the concatination constraints. No functional change. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki I would like to find a slightly nicer way of conditional parts, but nothing comes to mind. --- automation/scripts/qubes-x86-64.sh | 14 +++++++++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 16 +++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index 10af274a0ba7..1dd3f48b3d29 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash =20 set -ex -o pipefail =20 @@ -187,10 +187,14 @@ Kernel \r on an \m (\l) rm -rf rootfs fi =20 -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz +# Dom0 rootfs. The order or concatination is important; ucode wants to co= me +# first, and all uncompressed must be ahead of compressed. +parts=3D( + binaries/ucode.cpio + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz +) +cat "${parts[@]}" > binaries/dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 8f02fa73bd06..0fbabb41054a 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -103,13 +103,15 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-r= ootfs.cpio.gz cd .. rm -rf rootfs =20 -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz -if [[ "${TEST}" =3D=3D argo ]]; then - cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz -fi +# Dom0 rootfs. The order or concatination is important; ucode wants to co= me +# first, and all uncompressed must be ahead of compressed. +parts=3D( + binaries/ucode.cpio + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz +) +[[ "${TEST}" =3D=3D argo ]] && parts+=3D(binaries/argo.cpio.gz) +cat "${parts[@]}" > binaries/dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs --=20 2.39.5 From nobody Fri Oct 31 09:32:01 2025 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; dkim=pass; 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; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1747935429; cv=none; d=zohomail.com; s=zohoarc; b=J9dxe+OoqPu08vt1RSnd33v7yKNH47r06i/eOOOVyOp0WQ/joL8upL3oEPFZmTA9qbL0s2OlayRChehdcAZxTZF34615VqfLhnXaYG7yFfOY1BPdBiIDXuBzGjmdM3jS2PeG73sb865Zk1hOfeTCett7nC75nlmLWZ9YtUfNLNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747935429; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GYyhCSHRy5HjeJM5vXD7f7xwD1MyIqvj5Lom+JBxOYs=; b=Sq/J9h3ak8X6+8c+MgET6Tdpl3HvpfS1lQdZNbILx8UUCEvmE0+GUFtEbtUa2YQIJ2yQclBkifzblytsxwTwcHfud39s+SiFtmhmoxELvJ+Lk/2OuzrJaOgx1pRfqAxTUIPgeq15sidlxdixCNUpFg+xjIZTsLsBtYKv6yhtrIE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1747935429783680.4355199621928; Thu, 22 May 2025 10:37:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.994481.1377472 (Exim 4.92) (envelope-from ) id 1uI9qb-00041G-69; Thu, 22 May 2025 17:36:49 +0000 Received: by outflank-mailman (output) from mailman id 994481.1377472; Thu, 22 May 2025 17:36:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI9qb-000419-3E; Thu, 22 May 2025 17:36:49 +0000 Received: by outflank-mailman (input) for mailman id 994481; Thu, 22 May 2025 17:36:47 +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 1uI9qZ-0003Za-Ic for xen-devel@lists.xenproject.org; Thu, 22 May 2025 17:36:47 +0000 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [2a00:1450:4864:20::634]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 55b7818f-3733-11f0-a2fb-13f23c93f187; Thu, 22 May 2025 19:36:47 +0200 (CEST) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-acacb8743a7so23655266b.1 for ; Thu, 22 May 2025 10:36:47 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d442069sm1116063366b.103.2025.05.22.10.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:36:45 -0700 (PDT) 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: 55b7818f-3733-11f0-a2fb-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1747935406; x=1748540206; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GYyhCSHRy5HjeJM5vXD7f7xwD1MyIqvj5Lom+JBxOYs=; b=hGGlNNGpf4xm0malAJyrycBtckdjd/f2vJSZi3jPs24FZ6/IZRyq9Gmu4/jFmhvLsu V7yUdk0YnMPb0ajFHr0RP+x4TkTU1bEGrAwbv6J90HfuRyBTE2qAfUvZ3ysYBHoxGIHC nr//62h1qj3ikfRHSiGVvQpczaZNU4hOhpB30= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747935406; x=1748540206; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GYyhCSHRy5HjeJM5vXD7f7xwD1MyIqvj5Lom+JBxOYs=; b=ufvoWUMB7dcEyPbLmFn924EgUyGOeGuxf2Gsw/W86Ah/VW7QltxhzDtc/yT1OqfyX+ ZjnRDWZPANhTglDf7Egm2wgoDF4Dirj94rvj7yxnAPn1kXvMePVuakKDQBI4UxJBMdlY iFy5cCO0jfERtF5TimCXNpCmClentK/ZtvKaHvnyAmJmp4KqUvsrvBrJLnEpMgs19TlE CXldlKHTx3S/MRimiaemrm+BVaDgF+eHEeiMCSYp6fhb0pU/6EPT3OSI0kr6sPJuRD7p BzjYvh2p9W7y/F6NAVeRAzYti/2Ce3XgeCF/1BhynAs48rEUy9aDFVKpdTbKyNGwjICv euvw== X-Gm-Message-State: AOJu0YxSr71VpNmnqnENeEZGX8eqtprYkReOoSeiMwH1VjWiUqD2GwRg hs2LDeOT6BYaNvYm5yPLrq9JpFLywtwwsHGKbMtbI3ztnpdzQ2x3DFDkDmLKoXF8RFskkFkiFEg wLO6x X-Gm-Gg: ASbGncsKfm0djOTC9J4g5CPRW4ltEObZzg3jKDnp5H8oC+rQm4O5jVSdhHPBwtv9OPJ qfo8gpL3+aMyZLZPjVIFWsGVRP7qJUaoJwurc9GHcPVXADcuIyi0rInOdbW515sQyPlKmKfTDth reSkDWu5BKCBic5kjvp2OWjyXpXwfgIgEUQtuicibcaHIyHYoI+SIJJhRM870sqF6wgPYWB/lCg M9nfbW06+bAlpqFd7P0uRhprjLs2qoUzBiBWc89rMQlUQUPSB0ZEvyKBaSaOxjXNiOgj4/iZHG/ NVAY0Eg8CnF30IBKT8/cDdY62vRsKLNV+mE87AkbCW0kG4a3QXPVjgLUVOKvUTlstk1CIOtIqUm qlgEaJQN57F0M0AG+AZi6AYKW X-Google-Smtp-Source: AGHT+IHWMogHCQeB9SJwpxg6yOOzinf1lZpu5URRocfLqaqgAeyz6UskeDQJ/1eJJRMxZON6lgEIug== X-Received: by 2002:a17:907:f497:b0:aca:95eb:12e with SMTP id a640c23a62f3a-ad64e921e3cmr26741466b.24.1747935406203; Thu, 22 May 2025 10:36:46 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 3/3] CI: Adjust how domU is packaged in dom0 Date: Thu, 22 May 2025 18:36:40 +0100 Message-Id: <20250522173640.575452-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522173640.575452-1-andrew.cooper3@citrix.com> References: <20250522173640.575452-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1747935430555116600 Package domU in /root for dom0 and insert into the uncompressed part of dom= 0's rootfs, rather than recompressing it as part of the overlay. For Qubes, this avoids putting the domU kernel in dom0's rootfs for tests which aren't going to boot a guest. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki --- automation/scripts/qubes-x86-64.sh | 20 +++++++++++++------ .../scripts/xilinx-smoke-dom0-x86_64.sh | 16 +++++++++++---- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index 1dd3f48b3d29..17a37134f46a 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -154,8 +154,8 @@ esac domU_config=3D" type =3D '${domU_type}' name =3D 'domU' -kernel =3D '/boot/vmlinuz' -ramdisk =3D '/boot/initrd-domU' +kernel =3D '/root/vmlinuz-domU' +ramdisk =3D '/root/initrd-domU' cmdline =3D 'root=3D/dev/ram0 console=3Dhvc0' memory =3D 512 vif =3D [ ${domU_vif} ] @@ -185,12 +185,24 @@ Kernel \r on an \m (\l) find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs + + # Package domU kernel+rootfs in /root for dom0 (uncompressed) + mkdir -p rootfs/root + cd rootfs + cp ../binaries/bzImage root/vmlinuz-domU + cp ../binaries/domU-rootfs.cpio.gz root/initrd-domU + find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio + cd .. + rm -rf rootfs fi =20 # Dom0 rootfs. The order or concatination is important; ucode wants to co= me # first, and all uncompressed must be ahead of compressed. parts=3D( binaries/ucode.cpio +) +[ -n "$domU_check" ] && parts+=3D(binaries/domU-in-dom0.cpio) +parts+=3D( binaries/rootfs.cpio.gz binaries/xen-tools.cpio.gz ) @@ -238,10 +250,6 @@ mkdir -p etc/default echo "XENCONSOLED_TRACE=3Dall" >> etc/default/xencommons echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -if [ -n "$domU_check" ]; then - cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -fi find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 0fbabb41054a..29817ff81d0a 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -22,8 +22,8 @@ DOMU_CMD=3D"" DOMU_CFG=3D' type =3D "pvh" name =3D "domU" -kernel =3D "/boot/vmlinuz" -ramdisk =3D "/boot/initrd-domU" +kernel =3D "/root/vmlinuz-domU" +ramdisk =3D "/root/initrd-domU" extra =3D "root=3D/dev/ram0 console=3Dhvc0" memory =3D 512 ' @@ -103,10 +103,20 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-r= ootfs.cpio.gz cd .. rm -rf rootfs =20 +# Package domU kernel+rootfs in /root for dom0 (uncompressed) +mkdir -p rootfs/root +cd rootfs +cp ../binaries/bzImage root/vmlinuz-domU +cp ../binaries/domU-rootfs.cpio.gz root/initrd-domU +find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio +cd .. +rm -rf rootfs + # Dom0 rootfs. The order or concatination is important; ucode wants to co= me # first, and all uncompressed must be ahead of compressed. parts=3D( binaries/ucode.cpio + binaries/domU-in-dom0.cpio binaries/rootfs.cpio.gz binaries/xen-tools.cpio.gz ) @@ -127,8 +137,6 @@ echo "${DOMU_CFG}${DOMU_CFG_EXTRA}" > etc/xen/domU.cfg echo "XENCONSOLED_TRACE=3Dall" >> etc/default/xencommons echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 --=20 2.39.5