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 C98F91BEE2; Thu, 07 Aug 2025 18:22:45 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id BD8ED1BE5B; Thu, 07 Aug 2025 18:22:43 +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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) by atuin.qyliss.net (Postfix) with ESMTPS id 55E251BE59 for ; Thu, 07 Aug 2025 18:22:43 +0000 (UTC) Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-7e29616cc4fso124082485a.0 for ; Thu, 07 Aug 2025 11:22:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754590962; x=1755195762; darn=spectrum-os.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=IDa86pCIH9FPxKbhVofSz1Fj6/do9pYpyB67/g5Av9M=; b=HibnHeh4ho5g07hMTmqTfRh6vN0ofFCLQJfzxbk7uE+6ktR1M8l+FpczusraRLeTcq zJ3s+nBI4+xB5vnL2vltghDUNrQiJbQTm8h21YQFIl7+hMsnH3Sb61j+9mh3rJ0thRyY aH9hjg5wPFtwsAjA6d+WSuI/hKQlLuEIprqA1IxrOF+SPzaxPt5sYII8w0TG7CUzKK2u AmcH212F0B1qJt1qlgJyvQUIwClwkVcup9KwDEpqFg5Pp2skV0NzYO+eUkHqAaMLtPbN uxZbV1eWiPR0W3FKloqWopdoVl591AzbKo0qosQbX/wLIBWxrNTZNS/m3Nz5H98OAppJ jCgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754590962; x=1755195762; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IDa86pCIH9FPxKbhVofSz1Fj6/do9pYpyB67/g5Av9M=; b=B+BI4x+XFzrf02IChLW4HiW+v6BkdqafY95U2IlCFb4utG+trJT+d+uZu7FcnfyDHy vD8+nHpnIa8yOUjsSwzHCLUYcq3MS52zO3an25JcLcbCpb4GCABLzkK9AJP6UJwVrjA7 9L9ZWtHbjXbWKc6Xaj5hlXxXugiLBK6ZDsw79fNWurxPnTnDhX+aCX+sGImm8/I6Felx B+nVlqcBajQbuPKB7FVtqMm/uWCw+6CftkeT1CN5kX2bk6pFuURK1yPvtDUhOE8Ya9ds u92cqk0YCRY4pcmQd72fi0BeQUKcSauArsX3sMZWTERUM161esmxs6llqoSrUsOxghO+ YpRw== X-Gm-Message-State: AOJu0YxabVsvjGCdiH0/bUpzt5e+YSF0OaIKQBJfysw3WVMnA/IZlvJq MKReHa21x0jH4KUEAqYzAzxpaJjC1oeIiCtksIhiPxXRP9gO/XGQjXtu5D7pNw== X-Gm-Gg: ASbGnctMPqUhO4ZhHLvhgG3FwTjgchxFd+FtM9upC30I9SezpNqY6J+t2Pi6ECZ6naJ zHXJJGPe7ORN7szFVQLbrpGyAqWL/2NKq2cuAaxMGwKyvK153hQpf4djDogQFrRJEnrYXly8xcc 7vo8DSUQSt9cY9O8pu0fHc8RkNILQitB4XoCvcimF7M3/fxJIHPHi/jzUSA1lRfnu+K/dI42nMK KFLH3/eu9NtWTjkLRqrmtk95oH0gvybQYcsxxM8ASzS954kF+dky6fCvwvELWT/CZ0dUKipSmMr gXib7SniMTPuyKWMQX4SRbAiqYpwDL+drgmc2arGU1NA+bfS3jqBuFemwtDVUGbAPbow/K27smw Xuk0j+xFAmSQhB2JHAXSMlgrf6fS90RHJYLM4IA== X-Google-Smtp-Source: AGHT+IGURay97qx7zWI4oLmXHBKIPEMHbWgSnipJUvywxoHFsn3Q8I3deIIGo92wbK3OlsVQNkWqDw== X-Received: by 2002:a05:620a:6cc3:b0:7e6:2c20:88dd with SMTP id af79cd13be357-7e82c648281mr24034185a.15.1754590961572; Thu, 07 Aug 2025 11:22:41 -0700 (PDT) Received: from localhost.localdomain ([89.187.178.201]) by smtp.gmail.com with UTF8SMTPSA id af79cd13be357-7e69716fa4asm747487285a.58.2025.08.07.11.22.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Aug 2025 11:22:41 -0700 (PDT) From: Demi Marie Obenour Date: Thu, 07 Aug 2025 14:21:37 -0400 Subject: [PATCH] vm: do not require KVM to run QEMU MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250807-no-require-kvm-v1-1-5dec3fbaef7b@gmail.com> X-B4-Tracking: v=1; b=H4sIALDulGgC/x3MQQqAIBBA0avErBuwyIyuEi1CpxoirZEiCO+et HyL/1+IJEwR+uIFoZsjB59RlQXYdfILIbtsqFWtVacM+oBC58VCuN072tZoPTeTI9NCjg6hmZ9 /OIwpfVXcxUlgAAAA X-Change-ID: 20250807-no-require-kvm-c6755f4ade76 To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1754590896; l=1989; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=Zmr2Z9DS2YzMCrpdmsto+cFAPG+vCcHYcdl+WLAA0/M=; b=oWaHFUBoCi80Ip6y7k968tIz79j5/o212PPAc71fTgmHlUDr1a30gxJFgkyCStybp591wcuKY Z95KWEUdhVCBFOqY6z+QpyRLm0aGPToPnzrmdlawAk+jhacHaHJklPD X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: ZW2M4IU6G3OIGI2XZSMWZHC3U57OL2VZ X-Message-ID-Hash: ZW2M4IU6G3OIGI2XZSMWZHC3U57OL2VZ X-MailFrom: demiobenour@gmail.com 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: Alyssa Ross , 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: This prevented running QEMU on Qubes OS. Signed-off-by: Demi Marie Obenour --- img/app/Makefile | 2 +- scripts/run-qemu.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/img/app/Makefile b/img/app/Makefile index 5380ffb76e7bdf8867dcb61560d77028bf910fa3..e458ffebb7db0718007dd15af6a17dda74d36d0a 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 -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/scripts/run-qemu.sh b/scripts/run-qemu.sh index 64fd29259ab108bc547cb7c74623ae9dc288b3b7..9fa240aed44822a0aff295d246cb23a0e1cf7b8a 100755 --- a/scripts/run-qemu.sh +++ b/scripts/run-qemu.sh @@ -5,6 +5,8 @@ # This script wraps around QEMU to paper over platform differences, # which can't be handled portably in Make language. +cpu='-cpu host' +if [ ! -f /dev/kvm ]; then cpu=; fi case "${ARCH:="$(uname -m)"}" in aarch64) machine=virt,accel=kvm:tcg,gic-version=3,iommu=smmuv3 @@ -51,7 +53,7 @@ while [ $i -lt $# ]; do virtualization=on) case "$ARCH" in aarch64) - opt="$opt,accel=tcg" + opt="$opt,accel=tcg" cpu= ;; *) continue @@ -88,4 +90,5 @@ exec ${QEMU_SYSTEM:-qemu-system-$ARCH} \ -machine "$machine" \ ${kernel:+${append:+-append "$append"}} \ ${iommu:+-device "$iommu"} \ + $cpu \ "$@" --- base-commit: 39baa378367d95fac6ce4d0140b25203b2ee9b53 change-id: 20250807-no-require-kvm-c6755f4ade76 -- Sincerely, Demi Marie Obenour (she/her/hers)