From e5c6e84121fe8d5727932626096c3bcd7997c384 Mon Sep 17 00:00:00 2001 From: Kristian Feldsam Date: Thu, 18 Jul 2024 09:36:59 +0200 Subject: [PATCH] F #6437: Allow to set CPU_MODEL[FEATURES] on host and cluster level (#6438) Signed-off-by: Kristian Feldsam --- src/vmm/LibVirtDriverKVM.cc | 2 +- src/vmm_mad/exec/vmm_exec_kvm.conf | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 1a7274d1a43..4ff7a960a75 100644 --- 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 index a469edec965..3f13ed766ec 100644 --- 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",