From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id A89A61CDA8; Thu, 14 Aug 2025 12:51:37 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 85EDC1CD96; Thu, 14 Aug 2025 12:51:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fout-b8-smtp.messagingengine.com (fout-b8-smtp.messagingengine.com [202.12.124.151]) by atuin.qyliss.net (Postfix) with ESMTPS id 451361CD94 for ; Thu, 14 Aug 2025 12:51:32 +0000 (UTC) Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfout.stl.internal (Postfix) with ESMTP id 55D3C1D00039; Thu, 14 Aug 2025 08:51:29 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Thu, 14 Aug 2025 08:51:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1755175889; x= 1755262289; bh=fpMXZ29kKLABtYk/whUEuQjjIANzH8S7NMB1xSVuNGs=; b=l rzFr7J94TJXJ9gz9hyiNgsSAlaHNCRiIynwltxizTxn96U6QthP1DDA5dhmxyzFZ p2GBftUyfv1Fck3w2aO3i67zBlvCmJ82ckWHrO/LxGnEynJsEx5zLTCGryM5ID4F /GXkLT6Zpd0VtAKMV1bwp2Xa+vCox6UFXGDZQiCf8trd370TlOYE4QpL2ygEOFhG NZx2wy7w+sAL64smcSH3EAVsEQos9moi3EdQibxKrAoWibhfbgXOFm8shf28ir2Y TZKX+AB7miQv+RGxhmDVHNwVaMnuWhpDLm2FdIHLP1+MMuBxENNEnwBNqYJSLlp8 TPX4ElgSkiky2CpuJkk6A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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-sender :x-me-sender:x-sasl-enc; s=fm3; t=1755175889; x=1755262289; bh=f pMXZ29kKLABtYk/whUEuQjjIANzH8S7NMB1xSVuNGs=; b=Fn4gF4WX19RHfaTFb KI+goqW42HgEzrHZQrICYB/GtmDIUV+FkvJ1TcigdUc0zyKCHN1E4nsC3u2hBXHq mKMoWRr3aNF/HKLqWpimZUeuKXTYIplzBPCQyJNCk7YJlh1kUs2Z2eUZtmCJD3z9 HtxyRVZJ8TX7t9Mrdz6S8RcYIm3jBLWpMazn8ysp6bNn4zo4deicg4ODpuubPETp AYXhKF+oQ2Y1eZXV8TdBIjtwcyceQJTTU39NYShT2XYIpVmdrAOIq5dY1qZ/yykM 1tjyIoVXeIoAT7AsYdCbpNecgocwLMaVrqzGCKvccXdFQOHCgob1mJZ4r6g59Amz WM2Fw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddugeduudefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehlhihsshgr ucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepgeeuie duueekkeeivdetffegkeduhfduvedvledvkefhfeeiteekuddujefffeegnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrg drihhspdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peguvghmihhosggvnhhouhhrsehgmhgrihhlrdgtohhmpdhrtghpthhtohepuggvvhgvlh esshhpvggtthhruhhmqdhoshdrohhrgh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 14 Aug 2025 08:51:28 -0400 (EDT) Received: by mbp.qyliss.net (Postfix, from userid 1000) id 62BCC13539B5; Thu, 14 Aug 2025 14:51:22 +0200 (CEST) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH] Use -cpu max instead of -cpu host Date: Thu, 14 Aug 2025 14:50:27 +0200 Message-ID: <20250814125026.193853-2-hi@alyssa.is> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250807-no-require-kvm-v1-1-5dec3fbaef7b@gmail.com> References: <20250807-no-require-kvm-v1-1-5dec3fbaef7b@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: YYQKV4P2FR44AJ3WNQHCR2DZLZEQFWZG X-Message-ID-Hash: YYQKV4P2FR44AJ3WNQHCR2DZLZEQFWZG X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Demi Marie Obenour X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: -cpu host doesn't work if KVM isn't available. This should do the right thing in both cases. Fixes: 0f2d3c7 ("Makefile: add run target to test with QEMU") Fixes: 3ebad5c ("run-vm.nix: add for running installer test VMs") Fixes: eaafee7 ("Makefile: add run target") Signed-off-by: Alyssa Ross --- Demi, could you please check whether this solves the problem for you on Qubes OS? I'd prefer to do it this way if it works, because it lets QEMU take care of the problem rather than our script. img/app/Makefile | 2 +- release/installer/run-vm.nix | 2 +- vm/sys/net/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/img/app/Makefile b/img/app/Makefile index 5380ffb..9665a6b 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -148,7 +148,7 @@ start-virtiofsd: scripts/start-virtiofsd.elb .PHONY: start-virtiofsd run-qemu: $(imgdir)/appvm/blk/root.img start-vhost-user-net start-virtiofsd - @../../scripts/run-qemu.sh -m 256 -cpu host -kernel $(KERNEL) -vga none \ + @../../scripts/run-qemu.sh -m 256 -cpu max -kernel $(KERNEL) -vga none \ -drive file=$(imgdir)/appvm/blk/root.img,if=virtio,format=raw,readonly=on \ -append "root=PARTLABEL=root nokaslr" \ -gdb unix:build/gdb.sock,server,nowait \ diff --git a/release/installer/run-vm.nix b/release/installer/run-vm.nix index dda9127..37b470c 100644 --- a/release/installer/run-vm.nix +++ b/release/installer/run-vm.nix @@ -28,7 +28,7 @@ writeShellScript "run-spectrum-installer-vm.sh" '' truncate -s 20G "$img" exec 3<>"$img" rm -f "$img" - exec ${../../scripts/run-qemu.sh} -cpu host -m 4G \ + exec ${../../scripts/run-qemu.sh} -cpu max -m 4G \ -device virtio-keyboard \ -device virtio-mouse \ -device virtio-gpu \ diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 785bd46..e681940 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -99,7 +99,7 @@ start-vhost-user-net: ../../../scripts/start-passt.elb run-qemu: $(vmdir)/netvm/blk/root.img - @../../../scripts/run-qemu.sh -m 256 -cpu host -kernel $(KERNEL) -vga none \ + @../../../scripts/run-qemu.sh -m 256 -cpu max -kernel $(KERNEL) -vga none \ -drive file=$(vmdir)/netvm/blk/root.img,if=virtio,format=raw,readonly=on \ -append "root=PARTLABEL=root nokaslr" \ -gdb unix:build/gdb.sock,server,nowait \ base-commit: 586577f3015397afacd83bc185454f4cc3c8028f -- 2.50.0