]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Don't use smm on aarch64
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 3 Jan 2024 07:50:29 +0000 (08:50 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 3 Jan 2024 08:42:13 +0000 (09:42 +0100)
This property is only supported on the x86 machines so stop trying
to use it on arm.

mkosi/config.py
mkosi/qemu.py

index 86cec608ad018594892a81a0b6635d05adf14f3d..452b75d6782ae403aaff5a70945fa16183f03169 100644 (file)
@@ -352,6 +352,9 @@ class Architecture(StrEnum):
     def supports_fw_cfg(self) -> bool:
         return self in (Architecture.x86, Architecture.x86_64, Architecture.arm, Architecture.arm64)
 
+    def supports_smm(self) -> bool:
+        return self in (Architecture.x86, Architecture.x86_64)
+
     def default_qemu_machine(self) -> str:
         m = {
             Architecture.x86      : "q35",
index b220e075fe7d423c1bb9e8994846f6329a0c3b0f..83428c9c024e1e7f4345a42a4661f2fb0a4eaea9 100644 (file)
@@ -537,7 +537,7 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig, qemu_device_fds: Mapping[Qemu
 
     machine = f"type={config.architecture.default_qemu_machine()}"
     if firmware == QemuFirmware.uefi:
-        machine += f",smm={'on' if ovmf_supports_sb else 'off'}"
+        machine += f",smm={'on' if ovmf_supports_sb and config.architecture.supports_smm() else 'off'}"
     if shm:
         machine += ",memory-backend=mem"