nixos/libvirt: remove 'virtualisation.libvirtd.enableKVM' option

2 files changed, 8 insertions, 11 deletions

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index eb10d4f428be..5e207a9509e2 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -82,6 +82,10 @@ with lib;
     (mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ])
     (mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ])
 
+    # libvirtd
+    (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]
+      "Set the option `virtualisation.libvirtd.qemuPackage' instead.")
+
     # Tarsnap
     (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])
 
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 7208b23116a5..64465ae18522 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -37,20 +37,13 @@ in {
       '';
     };
 
-    virtualisation.libvirtd.enableKVM = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        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;
+      default = pkgs.qemu;
       description = ''
-        Qemu package to use with libvirt
+        Qemu package to use with libvirt.
+        `pkgs.qemu` can emulate alien architectures (e.g. aarch64 on x86)
+        `pkgs.qemu_kvm` saves disk space allowing to emulate only host architectures.
       '';
     };