summaryrefslogtreecommitdiffstats
path: root/fragments
diff options
context:
space:
mode:
authorWolfgang Müller2024-09-19 09:55:40 +0200
committerWolfgang Müller2024-09-19 09:55:40 +0200
commitad0017ddae02a15d48ea0d37291d9ecb9e36ab13 (patch)
tree2ba6e9a50f74e33c2f71ca0eed8dc2624179ccd0 /fragments
parentc08d9b706a19de5b35704170971959382327bc74 (diff)
downloadkernfrag-ad0017ddae02a15d48ea0d37291d9ecb9e36ab13.tar.gz
Simplify handling of KVM-based options
Where before we had a profile/vm fragment that was set on nearly every host we administer, now make sure to enable KVM unconditionally and put CPU-specific KVM options into the CPU profiles.
Diffstat (limited to '')
-rw-r--r--fragments/base/vm (renamed from fragments/profile/vm)2
-rw-r--r--fragments/cpu/amd2
-rw-r--r--fragments/cpu/intel2
3 files changed, 4 insertions, 2 deletions
diff --git a/fragments/profile/vm b/fragments/base/vm
index bf6bc2d..0bc2760 100644
--- a/fragments/profile/vm
+++ b/fragments/base/vm
@@ -1,6 +1,4 @@
CONFIG_KVM=y
-CONFIG_KVM_INTEL=y
-CONFIG_KVM_AMD=y
CONFIG_VHOST_NET=m
CONFIG_MACVLAN=m
diff --git a/fragments/cpu/amd b/fragments/cpu/amd
index 9b9d035..cd8c7ef 100644
--- a/fragments/cpu/amd
+++ b/fragments/cpu/amd
@@ -9,3 +9,5 @@ CONFIG_SENSORS_FAM15H_POWER=y
CONFIG_EDAC_AMD64=y
CONFIG_AMD_IOMMU=y
+
+CONFIG_KVM_AMD=y
diff --git a/fragments/cpu/intel b/fragments/cpu/intel
index c64743e..7aab257 100644
--- a/fragments/cpu/intel
+++ b/fragments/cpu/intel
@@ -5,3 +5,5 @@ CONFIG_MCORE2=y
CONFIG_X86_INTEL_TSX_MODE_ON=y
CONFIG_SENSORS_CORETEMP=y
+
+CONFIG_KVM_INTEL=y