From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 9BE669061B; Mon, 10 Oct 2022 23:33:03 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id D795E902A0; Mon, 10 Oct 2022 23:32:35 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id D3A42900D1 for ; Mon, 10 Oct 2022 23:32:13 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 38DFD5C01B7 for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 10 Oct 2022 19:32:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1665444730; x=1665531130; bh=7D we9HhEkkyb9Xp3Bdnorv2OoUcI78jCUgTzxxgugkk=; b=kZIazKz2H3a9Dcrld5 rmxaDgstbaXyOrvwRLBgT3qOWX0MB2DIXGtBfXDwdvNg+U5X52OYX3C7Q7wxB8RO YwtFgvD0yyhF+xp+q7bav6CGwzfcIRLn3GV8Gd26Lc2HSA4WcupHJOeSptycH5aU MQh0GMzxK1dZhXEO9sy7M8nve3R+DYKPnkpBhFOtaYClpWyC4aQF2DFxtZ0DjuHQ bWREZ0bOwiRObQisrQV9XIXN1bPxWqoElVgnR1bX8jM7UilwBBYx+wo/HRUecrwI vk5XkjaYcYgpoSgtHeCMMDh6x4qZ4Tw1R3qvoSWf4gnGY/hkh7Li8/Yvp+AWiYEa ucXw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1665444730; x=1665531130; bh=7Dwe9HhEkkyb9 Xp3Bdnorv2OoUcI78jCUgTzxxgugkk=; b=ttno2QfsEdpy7XuHAfbkP81VAVA+8 /HdPxnZzeQVWX0om1esdgFsaVF17vdzzbcUvU/iwlUEgfETxRwMBFnB+07hLX5S5 Yu53xp9uUOxfnMD7KqPVRXE/bCxtIbmTPdiCKUFal4Y+gS25N9MhfMnHwk2FPVEN 0qLdK0C5KDqoN5snZKh4qEKgWKXnYY1q95JiWCQJbGS2Eo1F7TaIzCQLSzs+Q7Pt xs+qLcL4yeyVyDazT29cK9oZrwHP/Qg9DYlqbNMv0ZkhkpIqLm3RxiMqR/C10Kes AR+0rod6R2Fz+7huD0lpd4OgS9arBq1A3PoRdetZdlavfLgA2lqx1VkKA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:09 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 9DF06BBE; Mon, 10 Oct 2022 23:32:06 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 13/22] host/rootfs: use a bigger test ext partition Date: Mon, 10 Oct 2022 23:28:53 +0000 Message-Id: <20221010232909.1953738-14-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is> References: <20221010232909.1953738-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: QTDARAQWSEOG5NIF2LBKAI2XUKXTX5XS X-Message-ID-Hash: QTDARAQWSEOG5NIF2LBKAI2XUKXTX5XS X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: So that we can test things that write to disk. Unlinking the file prior to starting the VM ensures that it won't stick around once it's no longer needed. I disable make's printing of the commands in favour of the shell's, because the cp can take some time on filesystems that don't support reflinks, and it's nice to see which command is currently running rather than all of them at once as make would show. Signed-off-by: Alyssa Ross --- host/rootfs/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 249af6d..bad52a2 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -144,14 +144,20 @@ build/live.img: $(SCRIPTS)/format-uuid.sh $(SCRIPTS)/make-gpt.sh build/rootfs.ve mv $@.tmp $@ run: build/live.img $(EXT_FS) build/rootfs.verity.roothash - $(QEMU_KVM) -cpu host -m 2G \ + @set -x && \ + ext="$$(mktemp build/spectrum-rootfs-extfs.XXXXXXXXXX.img)" && \ + cp $(EXT_FS) "$$ext" && \ + exec 3<>"$$ext" && \ + rm -f "$$ext" && \ + truncate -s +10G /proc/self/fd/3 && \ + exec $(QEMU_KVM) -cpu host -m 2G \ -machine q35,kernel=$(KERNEL),kernel-irqchip=split,initrd=$(INITRAMFS) \ -display gtk,gl=on \ -qmp unix:vmm.sock,server,nowait \ -monitor vc \ -parallel none \ -drive file=build/live.img,if=virtio,format=raw,readonly=on \ - -drive file=$(EXT_FS),if=virtio,format=raw,readonly=on \ + -drive file=/proc/self/fd/3,if=virtio,format=raw \ -append "console=ttyS0 roothash=$$(< build/rootfs.verity.roothash) ext=/dev/vdb intel_iommu=on" \ -device intel-iommu,intremap=on \ -device virtio-vga-gl \ -- 2.37.1