diff options
| author | volth <volth@volth.com> | 2017-12-06 04:33:45 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-12-21 03:56:40 +0000 |
| commit | a52aa6aafb1457548c78c0b759e47fc63f40ed76 (patch) | |
| tree | f73f352c5fd228e0f1b9b7e6878e67d56a34707c /nixos/modules/virtualisation | |
| parent | fd91e1441f1d4e784e66e40c0e31b3cb8b55fcd2 (diff) | |
| download | nixlib-a52aa6aafb1457548c78c0b759e47fc63f40ed76.tar nixlib-a52aa6aafb1457548c78c0b759e47fc63f40ed76.tar.gz nixlib-a52aa6aafb1457548c78c0b759e47fc63f40ed76.tar.bz2 nixlib-a52aa6aafb1457548c78c0b759e47fc63f40ed76.tar.lz nixlib-a52aa6aafb1457548c78c0b759e47fc63f40ed76.tar.xz nixlib-a52aa6aafb1457548c78c0b759e47fc63f40ed76.tar.zst nixlib-a52aa6aafb1457548c78c0b759e47fc63f40ed76.zip | |
nixos/libvirt: avoid dependency on two qemu packages
Currently libvirt requires two qemu derivations: qemu and qemu_kvm which is just a truncated version of qemu (defined as qemu.override { hostCpuOnly = true; }).
This patch exposes an option virtualisation.libvirtd.qemuPackage which allows to choose which package to use:
* pkgs.qemu_kvm if all your guests have the same CPU as host, or
* pkgs.qemu which allows to emulate alien architectures (for example ARMV7L on X86_64), or
* a custom derivation
virtualisation.libvirtd.enableKVM option is vague and could be deprecate in favor of virtualisation.libvirtd.qemuPackage, anyway it does allow to enable/disable kvm.
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/libvirtd.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 8aa7ad8e3911..7208b23116a5 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -41,7 +41,16 @@ in { type = types.bool; default = true; description = '' - This option enables support for QEMU/KVM in libvirtd. + This option disables support for non-KVM guests in libvirtd (e.g. aarch64 on x86). + KVM is available even if this setting is false. + ''; + }; + + virtualisation.libvirtd.qemuPackage = mkOption { + type = types.package; + default = if cfg.enableKVM then pkgs.qemu_kvm else pkgs.qemu; + description = '' + Qemu package to use with libvirt ''; }; @@ -102,7 +111,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ]; + environment.systemPackages = with pkgs; [ libvirt netcat-openbsd cfg.qemuPackage ]; boot.kernelModules = [ "tun" ]; @@ -154,9 +163,9 @@ in { # stable (not GC'able as in /nix/store) paths for using in <emulator> section of xml configs mkdir -p /run/libvirt/nix-emulators - ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/ - ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"} - ${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"} + for emulator in ${pkgs.libvirt}/libexec/libvirt_lxc ${cfg.qemuPackage}/bin/qemu-kvm ${cfg.qemuPackage}/bin/qemu-system-*; do + ln -s --force "$emulator" /run/libvirt/nix-emulators/ + done ${optionalString cfg.qemuOvmf '' mkdir -p /run/libvirt/nix-ovmf |