From 42395a191b36614ae4e009fda238d0eee748aa13 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 13 Jul 2017 20:12:50 +0300 Subject: [PATCH] kernel-config: Disable Xen on non-x86 There's an upstream build failure on ARM (not directly related to Xen but rather some other config options it enables). The xen package is x86_64-only anyways. --- .../linux/kernel/common-config.nix | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f9cb9e73e776..73dce131cf8b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -521,27 +521,29 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.13") '' KVM_VFIO y ''} - XEN? y - XEN_DOM0? y - ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' - PCI_XEN? y - HVC_XEN? y - HVC_XEN_FRONTEND? y - XEN_SYS_HYPERVISOR? y - SWIOTLB_XEN? y - XEN_BACKEND? y - XEN_BALLOON? y - XEN_BALLOON_MEMORY_HOTPLUG? y - XEN_EFI? y - XEN_HAVE_PVMMU? y - XEN_MCE_LOG? y - XEN_PVH? y - XEN_PVHVM? y - XEN_SAVE_RESTORE? y - XEN_SCRUB_PAGES? y - XEN_SELFBALLOONING? y - XEN_STUB? y - XEN_TMEM? y + ${optionalString (stdenv.isx86_64 || stdenv.isi686) '' + XEN? y + XEN_DOM0? y + ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' + PCI_XEN? y + HVC_XEN? y + HVC_XEN_FRONTEND? y + XEN_SYS_HYPERVISOR? y + SWIOTLB_XEN? y + XEN_BACKEND? y + XEN_BALLOON? y + XEN_BALLOON_MEMORY_HOTPLUG? y + XEN_EFI? y + XEN_HAVE_PVMMU? y + XEN_MCE_LOG? y + XEN_PVH? y + XEN_PVHVM? y + XEN_SAVE_RESTORE? y + XEN_SCRUB_PAGES? y + XEN_SELFBALLOONING? y + XEN_STUB? y + XEN_TMEM? y + ''} ''} KSM y ${optionalString (!stdenv.is64bit) ''