diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-15 16:50:20 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-15 18:38:15 -0700 |
| commit | bca69399a88c50a9220c9888f85663a449ebc5c9 (patch) | |
| tree | 53fb84cfdf6a1cebc4c01b43aa78388e662b1d10 /pkgs/os-specific/linux | |
| parent | 7aae0f3115b57d9dbbdf0cb05d3bbbd13abe0f9f (diff) | |
| download | nixpkgs-bca69399a88c50a9220c9888f85663a449ebc5c9.tar nixpkgs-bca69399a88c50a9220c9888f85663a449ebc5c9.tar.gz nixpkgs-bca69399a88c50a9220c9888f85663a449ebc5c9.tar.bz2 nixpkgs-bca69399a88c50a9220c9888f85663a449ebc5c9.tar.lz nixpkgs-bca69399a88c50a9220c9888f85663a449ebc5c9.tar.xz nixpkgs-bca69399a88c50a9220c9888f85663a449ebc5c9.tar.zst nixpkgs-bca69399a88c50a9220c9888f85663a449ebc5c9.zip | |
kernel-config: kvm changes
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1a9b9297261..7eb68952f30 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -383,10 +383,27 @@ with stdenv.lib; '' else '' PARAVIRT_GUEST? y ''} - KVM_GUEST? y + KVM_APIC_ARCHITECTURE y + KVM_ASYNC_PF y ${optionalString (versionOlder version "3.7") '' KVM_CLOCK? y ''} + ${optionalString (versionAtLeast version "4.0") '' + KVM_COMPAT y + ''} + ${optionalString (versionAtLeast version "3.10") '' + KVM_DEVICE_ASSIGNMENT y + ''} + ${optionalString (versionAtLeast version "4.0") '' + KVM_GENERIC_DIRTYLOG_READ_PROTECT y + ''} + ${optionalString (!features.grsecurity or true) '' + KVM_GUEST y + ''} + KVM_MMIO y + ${optionalString (versionAtLeast version "3.13") '' + KVM_VFIO y + ''} XEN? y XEN_DOM0? y ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' |