From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 18 Dec 2023 22:06:55 +0000 (+0100)
Subject: Add support for booting powerpc images
X-Git-Tag: v20~53^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2bec9dafce46dd1101bf79dfe505f265eb0368a;p=thirdparty%2Fmkosi.git

Add support for booting powerpc images
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 93c92c804..d215bc411 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -319,8 +319,8 @@ class Architecture(StrEnum):
             Architecture.mips_le     : "mips",
             Architecture.parisc      : "hppa",
             Architecture.ppc         : "ppc",
-            Architecture.ppc64       : "ppc",
-            Architecture.ppc64_le    : "ppc",
+            Architecture.ppc64       : "ppc64",
+            Architecture.ppc64_le    : "ppc64",
             Architecture.riscv32     : "riscv32",
             Architecture.riscv64     : "riscv64",
             Architecture.s390x       : "s390x",
@@ -335,10 +335,13 @@ class Architecture(StrEnum):
 
     def default_serial_tty(self) -> str:
         return {
-            Architecture.arm   : "ttyAMA0",
-            Architecture.arm64 : "ttyAMA0",
-            Architecture.s390  : "ttysclp0",
-            Architecture.s390x : "ttysclp0",
+            Architecture.arm      : "ttyAMA0",
+            Architecture.arm64    : "ttyAMA0",
+            Architecture.s390     : "ttysclp0",
+            Architecture.s390x    : "ttysclp0",
+            Architecture.ppc      : "hvc0",
+            Architecture.ppc64    : "hvc0",
+            Architecture.ppc64_le : "hvc0",
         }.get(self, "ttyS0")
 
     def supports_smbios(self, firmware: QemuFirmware) -> bool:
diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index e0456344f..69aab36f4 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -533,6 +533,8 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig, qemu_device_fds: Mapping[Qemu
         machine = "type=virt"
     elif config.architecture == Architecture.s390x:
         machine = "type=s390-ccw-virtio"
+    elif config.architecture == Architecture.ppc64_le:
+        machine = "type=pseries"
     else:
         machine = f"type=q35,smm={'on' if ovmf_supports_sb else 'off'}"