From: Daan De Meyer Date: Wed, 3 Jan 2024 07:50:29 +0000 (+0100) Subject: Don't use smm on aarch64 X-Git-Tag: v20~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e77c1254ff111053c97ea0524521ff84560ab5e9;p=thirdparty%2Fmkosi.git Don't use smm on aarch64 This property is only supported on the x86 machines so stop trying to use it on arm. --- diff --git a/mkosi/config.py b/mkosi/config.py index 86cec608a..452b75d67 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -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", diff --git a/mkosi/qemu.py b/mkosi/qemu.py index b220e075f..83428c9c0 100644 --- a/mkosi/qemu.py +++ b/mkosi/qemu.py @@ -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"