From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 13 Dec 2022 12:51:48 +0000 (+0000)
Subject: Fix qemu tpm device name on aarch64
X-Git-Tag: v15~381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d551b8df4373e6c8a6fd20e888c697cd88c271fd;p=thirdparty%2Fmkosi.git

Fix qemu tpm device name on aarch64
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 859dc1b01..dea9ce201 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -6584,9 +6584,13 @@ def run_qemu_setup(config: MkosiConfig) -> Iterator[List[str]]:
             cmdline += [
                 "-chardev", f"socket,id=chrtpm,path={swtpm_socket}",
                 "-tpmdev", "emulator,id=tpm0,chardev=chrtpm",
-                "-device", "tpm-tis,tpmdev=tpm0",
             ]
 
+            if config.architecture == "x86_64":
+                cmdline += ["-device", "tpm-tis,tpmdev=tpm0"]
+            elif config.architecture == "aarch64":
+                cmdline += ["-device", "tpm-tis-device,tpmdev=tpm0"]
+
         cmdline += config.qemu_args
         cmdline += config.cmdline