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

This commit is contained in:
volth 2017-12-06 11:07:41 +00:00 committed by Orivej Desh
parent a52aa6aafb
commit 363cdde475
2 changed files with 8 additions and 11 deletions

View File

@ -82,6 +82,10 @@ with lib;
(mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ]) (mkRenamedOptionModule [ "services" "virtualboxHost" "addNetworkInterface" ] [ "virtualisation" "virtualbox" "host" "addNetworkInterface" ])
(mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ]) (mkRenamedOptionModule [ "services" "virtualboxHost" "enableHardening" ] [ "virtualisation" "virtualbox" "host" "enableHardening" ])
# libvirtd
(mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]
"Set the option `virtualisation.libvirtd.qemuPackage' instead.")
# Tarsnap # Tarsnap
(mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ]) (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])

View File

@ -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 { virtualisation.libvirtd.qemuPackage = mkOption {
type = types.package; type = types.package;
default = if cfg.enableKVM then pkgs.qemu_kvm else pkgs.qemu; default = pkgs.qemu;
description = '' 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.
''; '';
}; };