From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 11 Jan 2024 13:08:25 +0000 (+0100)
Subject: Prefer qemu-system-xxx binaries
X-Git-Tag: v20.1~6^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=539edaf1f3f6156c2262848b3870fdbdc510e2d5;p=thirdparty%2Fmkosi.git

Prefer qemu-system-xxx binaries

The qemu and qemu-kvm binaries are just shorthands for specific configs.
Let's prefer the actual binaries over the shorthands.
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 8284c98c3..bc641d0c2 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -149,8 +149,8 @@ class KernelType(StrEnum):
 
 
 def find_qemu_binary(config: Config) -> str:
-    binaries = ["qemu", "qemu-kvm"] if config.architecture.is_native() else []
-    binaries += [f"qemu-system-{config.architecture.to_qemu()}"]
+    binaries = [f"qemu-system-{config.architecture.to_qemu()}"]
+    binaries += ["qemu", "qemu-kvm"] if config.architecture.is_native() else []
     for binary in binaries:
         if find_binary(binary, root=config.tools()) is not None:
             return binary