From ec7ad19010b201221febf0d74eca28bb6ab659f4 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sun, 6 Oct 2024 15:19:14 +0000 Subject: [PATCH] qemu: have qemu_xen build for i386-softmmu by default Signed-off-by: Fernando Rodrigues --- pkgs/applications/virtualization/qemu/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 3b797c957e83..619cc9daeba6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -38,6 +38,8 @@ , hostCpuOnly ? false , hostCpuTargets ? (if toolsOnly then [ ] + else if xenSupport + then [ "i386-softmmu" ] else if hostCpuOnly then (lib.optional stdenv.hostPlatform.isx86_64 "i386-softmmu" ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"]) @@ -50,6 +52,8 @@ , qemu-utils # for tests attribute }: +assert lib.assertMsg (xenSupport -> hostCpuTargets == [ "i386-softmmu" ]) "Xen should not use any other QEMU architecture other than i386."; + let hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;