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_H2, 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 AC1236D40B; Thu, 22 Sep 2022 07:57:16 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 9FAD86D2FB; Thu, 22 Sep 2022 07:57:14 +0000 (UTC) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by atuin.qyliss.net (Postfix) with ESMTPS id E887A6D33B for ; Thu, 22 Sep 2022 07:57:11 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 31AD0320085B; Thu, 22 Sep 2022 03:57:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 22 Sep 2022 03:57:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :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=fm1; t=1663833429; x=1663919829; bh=dK LQDzzvTD61qSgXp5VebQw7A1ktIVTCL1sdtbYe55k=; b=iz5Wqif/wECMCn7Mm0 IIoghB/OlwTIP9CD07Nei8i1LOOAdoBZiOSnVUaGLv/yRwjT+EDlcBMxj3C4kWmM BqNjiCHOERj6bSVgoH5FuN3YvpiweYi5x561QEjK0FaQBBo2DrKrzOrIrvR/8KNt T52ZQLPCLa7revL319n/5XGe8Mu36cqnMBYQD6UQuGRJgcmWF2EQCfR0Y16bCGuy wV/tiqtDnPWG5GTgk/vCP7MDnzZCarh9F7adYcsrwRFnl35hjfC0EJKf9L4vqMTh i80ANArFmRjOId+DDhDZPUaKIeV7q40A1+v/eSMn0qTPDJC4QLYIguLSfFbuexp1 1R2w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=fm2; t=1663833429; x=1663919829; bh=dKLQDzzvTD61q SgXp5VebQw7A1ktIVTCL1sdtbYe55k=; b=r2tkmrA0+W2fjgP5pdvzYsa7qj4UU K+onDayoDv6iAqsRZAZ9ggjazFy6YAiRJw7UGP+JiliQfoJUAWsPQO2DJhWrk+Zu hcuTqk0HzvzBgOPDuCSGDpptAW4Vv22vB2bIHRUfBD4+RcxJaf6ZBjgyH7o0LvLM 2c6Y8mpH99qzyaLsTKiGZ2s6Qj3xk2BFtLbB+2xjzCMPYtYmzK0BsoXmDUAjaJ3c ALrcXi9QiAusn+gs+jwSxf/ZKfa60BFsiwuWZyX1la2Chw2GBRHv2aJBJq3bEiRH DMlfn6PSXRLRiDq7MEBjyd7Utq3tYFp2vFTlIYyMyXOUu5aRHWV+n/4Jg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefvddguddviecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeetlhih shhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpe egueeiudeukeekiedvteffgeekudfhudevvdelvdekhfefieetkeduudejffefgeenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehqhihlihhssh esgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 22 Sep 2022 03:57:09 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 9E0181DA; Thu, 22 Sep 2022 07:57:08 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 2/2] Add IOMMU to other host test targets Date: Thu, 22 Sep 2022 07:56:29 +0000 Message-Id: <20220922075629.247058-3-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220922075629.247058-1-hi@alyssa.is> References: <20220922075629.247058-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: DVBI4KPOKIPD2B5EWNAOJVMRYME6UFPK X-Message-ID-Hash: DVBI4KPOKIPD2B5EWNAOJVMRYME6UFPK 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 CC: Vadim Likholetov 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: This will make it possible to test passthrough in all test targets where it makes sense, rather than just host/rootfs. I think we should consider in future having a single wrapper script that runs QEMU with all the flags necessary to support Spectrum's hardware requirements, because this is only going to get more difficult to maintain once we need to support multiple CPU architectures. Reported-by: Vadim Likholetov Signed-off-by: Alyssa Ross --- host/initramfs/Makefile | 2 ++ img/combined/run-vm.nix | 3 ++- img/live/Makefile | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/host/initramfs/Makefile b/host/initramfs/Makefile index 596b15e..602b5b3 100644 --- a/host/initramfs/Makefile +++ b/host/initramfs/Makefile @@ -69,7 +69,9 @@ run: build/initramfs build/rootfs.verity.roothash build/live.img -initrd build/initramfs \ -append "ro console=ttyS0 ext=vda intel_iommu=on roothash=$$(< build/rootfs.verity.roothash)" \ -cpu host \ + -machine q35,kernel-irqchip=split \ -display gtk,gl=on \ + -device intel-iommu,intremap=on \ -device virtio-vga-gl \ -device qemu-xhci \ -device usb-storage,drive=drive1,removable=true \ diff --git a/img/combined/run-vm.nix b/img/combined/run-vm.nix index 40eacc4..047bc3f 100644 --- a/img/combined/run-vm.nix +++ b/img/combined/run-vm.nix @@ -13,8 +13,9 @@ writeShellScript "run-spectrum-installer-vm.sh" '' truncate -s 10G "$img" exec 3<>"$img" rm -f "$img" - exec qemu-kvm -cpu host -m 4G -machine q35 -snapshot \ + exec qemu-kvm -cpu host -m 4G -machine q35,kernel-irqchip=split -snapshot \ -display gtk,gl=on \ + -device intel-iommu,intremap=on \ -device virtio-vga-gl \ -device qemu-xhci \ -device usb-storage,drive=drive1,removable=true \ diff --git a/img/live/Makefile b/img/live/Makefile index f13dd26..5942251 100644 --- a/img/live/Makefile +++ b/img/live/Makefile @@ -61,7 +61,9 @@ clean: run: build/live.img $(QEMU_KVM) -m 4G \ -cpu host \ + -machine q35,kernel-irqchip=split \ -display gtk,gl=on \ + -device intel-iommu,intremap=on \ -device virtio-vga-gl \ -device qemu-xhci \ -device usb-storage,drive=drive1,removable=true \ -- 2.37.1