From ad0017ddae02a15d48ea0d37291d9ecb9e36ab13 Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Thu, 19 Sep 2024 09:55:40 +0200
Subject: 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.
---
 fragments/base/vm    | 7 +++++++
 fragments/cpu/amd    | 2 ++
 fragments/cpu/intel  | 2 ++
 fragments/profile/vm | 9 ---------
 templates/albatross  | 1 -
 templates/base       | 1 +
 templates/coleridge  | 1 -
 templates/nabokov    | 1 -
 8 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 fragments/base/vm
 delete mode 100644 fragments/profile/vm

diff --git a/fragments/base/vm b/fragments/base/vm
new file mode 100644
index 0000000..0bc2760
--- /dev/null
+++ b/fragments/base/vm
@@ -0,0 +1,7 @@
+CONFIG_KVM=y
+CONFIG_VHOST_NET=m
+
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=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
diff --git a/fragments/profile/vm b/fragments/profile/vm
deleted file mode 100644
index bf6bc2d..0000000
--- a/fragments/profile/vm
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_KVM=y
-CONFIG_KVM_INTEL=y
-CONFIG_KVM_AMD=y
-CONFIG_VHOST_NET=m
-
-CONFIG_MACVLAN=m
-CONFIG_MACVTAP=m
-CONFIG_IPVLAN=m
-CONFIG_IPVTAP=m
diff --git a/templates/albatross b/templates/albatross
index 2a218cf..f3b9032 100644
--- a/templates/albatross
+++ b/templates/albatross
@@ -16,5 +16,4 @@ hosts/albatross
 net/bluetooth
 profile/desktop
 profile/systemd
-profile/vm
 security/tpm
diff --git a/templates/base b/templates/base
index 6527d4f..5169a1b 100644
--- a/templates/base
+++ b/templates/base
@@ -5,6 +5,7 @@ base/modules
 base/net
 base/security
 base/tasks
+base/vm
 drivers/i2c
 drivers/pci
 drivers/sata
diff --git a/templates/coleridge b/templates/coleridge
index 3261442..d6b7c06 100644
--- a/templates/coleridge
+++ b/templates/coleridge
@@ -4,5 +4,4 @@ devices/net/r8169
 drivers/raid
 hosts/coleridge
 profile/server
-profile/vm
 security/audit
diff --git a/templates/nabokov b/templates/nabokov
index f35afd1..3f10cd5 100644
--- a/templates/nabokov
+++ b/templates/nabokov
@@ -12,4 +12,3 @@ hosts/nabokov
 net/bluetooth
 profile/desktop
 profile/systemd
-profile/vm
-- 
cgit v1.2.3-2-gb3c3