Merge branch 'main' into mmds_accept

Author: zulinx86

tests/integration_tests/functional/test_cpu_features_host_vs_guest.py

@@ -120,6 +120,9 @@
     "vgif",
     "vmcb_clean",
     "wdt",
+    "npt",
+    "nrip_save",
+    "svm",
 }
 
 AMD_GUEST_ONLY_FEATS = {
@@ -130,14 +133,7 @@
 }
 
 AMD_MILAN_HOST_ONLY_FEATS_6_1 = AMD_MILAN_HOST_ONLY_FEATS - {
-    "lbrv",
-    "pausefilter",
-    "pfthreshold",
     "sme",
-    "tsc_scale",
-    "v_vmsave_vmload",
-    "vgif",
-    "vmcb_clean",
 } | {"brs", "rapl", "v_spec_ctrl"}
 
 AMD_GENOA_HOST_ONLY_FEATS = AMD_MILAN_HOST_ONLY_FEATS | {

tests/integration_tests/functional/test_cpu_template_helper.py

@@ -177,7 +177,8 @@ def build_cpu_config_dict(cpu_config_path):
 }
 
 
-# List of MSR indices that should not be tested due to its mutability.
+# List of MSR indices that should not be tested due to its mutability or inavailablility
+# in the guest.
 MSR_EXCEPTION_LIST = [
     # MSR_KVM_WALL_CLOCK and MSR_KVM_SYSTEM_TIME depend on the elapsed time.
     0x11,
@@ -232,6 +233,10 @@ def build_cpu_config_dict(cpu_config_path):
     # MSR_AMD64_VIRT_SPEC_CTRL is R/W and can be modified by OS to control
     # security features for speculative attacks.
     0xC001011F,
+    # Not available in the guest
+    # MSR_TSC_RATE is a Time Stamp Counter Ratio which allows the hypervisor
+    # to control the guest's view of the Time Stamp Counter.
+    0xC0000104,
 ]