JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux: remove xen_dom0 feature entirely

Browse Source 
Xen is now enabled unconditionally on kernels that support it, so the
xen_dom0 feature doesn't do anything.  The isXen attribute will now
produce a deprecation warning and unconditionally return true.
Passing in a custom value for isXen is no longer supported.
This commit is contained in:
Alyssa Ross 2021-04-04 14:55:56 +00:00
parent f310134dec
commit 25208eeaba
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/virtualisation/xen-dom0.nix
View File

@ -161,9 +161,6 @@ in
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
# Make sure Domain 0 gets the required configuration
#boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; };
boot.kernelModules = boot.kernelModules =
[ "xen-evtchn" "xen-gntdev" "xen-gntalloc" "xen-blkback" "xen-netback" [ "xen-evtchn" "xen-gntdev" "xen-gntalloc" "xen-blkback" "xen-netback"
"xen-pciback" "evtchn" "gntdev" "netbk" "blkbk" "xen-scsibk" "xen-pciback" "evtchn" "gntdev" "netbk" "blkbk" "xen-scsibk"

5
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -46,7 +46,6 @@
stdenv.hostPlatform != stdenv.buildPlatform stdenv.hostPlatform != stdenv.buildPlatform
, extraMeta ? {} , extraMeta ? {}
, isXen ? features.xen_dom0 or false
, isZen ? false , isZen ? false
, isLibre ? false , isLibre ? false
, isHardened ? false , isHardened ? false
@ -74,7 +73,6 @@ let
needsCifsUtils = true; needsCifsUtils = true;
netfilterRPFilter = true; netfilterRPFilter = true;
grsecurity = false; grsecurity = false;
xen_dom0 = false;
ia32Emulation = true; ia32Emulation = true;
} // features) kernelPatches; } // features) kernelPatches;
@ -178,7 +176,8 @@ let
passthru = { passthru = {
features = kernelFeatures; features = kernelFeatures;
inherit commonStructuredConfig isXen isZen isHardened isLibre; inherit commonStructuredConfig isZen isHardened isLibre;
isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version; kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version; kernelAtLeast = lib.versionAtLeast version;
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);

4
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -37,7 +37,6 @@ in {
extraMeta ? {}, extraMeta ? {},
# for module compatibility # for module compatibility
isXen ? features.xen_dom0 or false,
isZen ? false, isZen ? false,
isLibre ? false, isLibre ? false,
isHardened ? false, isHardened ? false,
@ -94,7 +93,8 @@ let
passthru = { passthru = {
inherit version modDirVersion config kernelPatches configfile inherit version modDirVersion config kernelPatches configfile
moduleBuildDependencies stdenv; moduleBuildDependencies stdenv;
inherit isXen isZen isHardened isLibre; inherit isZen isHardened isLibre;
isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
kernelOlder = lib.versionOlder version; kernelOlder = lib.versionOlder version;
kernelAtLeast = lib.versionAtLeast version; kernelAtLeast = lib.versionAtLeast version;
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -19777,7 +19777,7 @@ in
inherit (kernel) stdenv; # in particular, use the same compiler by default inherit (kernel) stdenv; # in particular, use the same compiler by default
# to help determine module compatibility # to help determine module compatibility
inherit (kernel) isXen isZen isHardened isLibre; inherit (kernel) isZen isHardened isLibre;
inherit (kernel) kernelOlder kernelAtLeast; inherit (kernel) kernelOlder kernelAtLeast;
# Obsolete aliases (these packages do not depend on the kernel). # Obsolete aliases (these packages do not depend on the kernel).