F #6437: Allow to set CPU_MODEL[FEATURES] on host and cluster level (#…

…6438) Signed-off-by: Kristian Feldsam <[email protected]>
OpenNebula · Jul 18, 2024 · e5c6e84 · e5c6e84
1 parent c8500c4
commit e5c6e84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc
@@ -943,7 +943,7 @@ int LibVirtDriver::deployment_description_kvm(
     // CPU SECTION
     // ------------------------------------------------------------------------
     get_attribute(vm, host, cluster, "CPU_MODEL", "MODEL", cpu_model);
-    get_attribute(vm, nullptr, nullptr, "CPU_MODEL", "FEATURES", cpu_feature);
+    get_attribute(vm, host, cluster, "CPU_MODEL", "FEATURES", cpu_feature);
 
     if (cpu_model == "host-passthrough")
     {

diff --git a/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf
@@ -39,6 +39,7 @@
 #      - VIRTIO_BLK_QUEUES
 #  * CPU_MODEL:
 #      - MODEL
+#      - FEATURES
 #  * DISK:
 #      - DRIVER
 #      - CACHE
@@ -83,7 +84,7 @@ FEATURES = [
     IOTHREADS = "0"
 ]
 
-#CPU_MODEL = [ MODEL = "host-passthrough"]
+#CPU_MODEL = [ MODEL = "host-passthrough", FEATURES = "md-clear"]
 
 DISK = [
     DRIVER  = "raw",