Changeset 107227 in vbox for trunk/src/VBox/VMM/VMMR3/NEMR3NativeTemplate-linux.cpp.h

Timestamp:

Dec 4, 2024 3:20:14 PM (6 weeks ago)

Author:

vboxsync

Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3NativeTemplate-linux.cpp.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3NativeTemplate-linux.cpp.h

@@ -66 +66 @@
 
         CAP_ENTRY__L(KVM_CAP_IRQCHIP),                       /* 0 */
-#ifdef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_VMM_TARGET_X86
+        CAP_ENTRY_ML(KVM_CAP_HLT),
+#else
         CAP_ENTRY__L(KVM_CAP_HLT),
-#else
-        CAP_ENTRY_ML(KVM_CAP_HLT),
 #endif
         CAP_ENTRY__L(KVM_CAP_MMU_SHADOW_CACHE_CONTROL),
@@ -120 +120 @@
         CAP_ENTRY__L(KVM_CAP_XEN_HVM),
 #endif
-#ifdef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_VMM_TARGET_X86
+        CAP_ENTRY_ML(KVM_CAP_ADJUST_CLOCK),
+#else
         CAP_ENTRY__L(KVM_CAP_ADJUST_CLOCK),
-#else
-        CAP_ENTRY_ML(KVM_CAP_ADJUST_CLOCK),
 #endif
         CAP_ENTRY__L(KVM_CAP_INTERNAL_ERROR_DATA),           /* 40 */
@@ -142 +142 @@
         CAP_ENTRY__L(KVM_CAP_DEBUGREGS),                     /* 50 */
 #endif
-#ifdef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_VMM_TARGET_X86
+        CAP_ENTRY__S(KVM_CAP_X86_ROBUST_SINGLESTEP, fRobustSingleStep),
+#else
         CAP_ENTRY__L(KVM_CAP_X86_ROBUST_SINGLESTEP),
-#else
-        CAP_ENTRY__S(KVM_CAP_X86_ROBUST_SINGLESTEP, fRobustSingleStep),
 #endif
         CAP_ENTRY__L(KVM_CAP_PPC_OSI),
@@ -305 +305 @@
         CAP_ENTRY__L(KVM_CAP_S390_DIAG318),
         CAP_ENTRY__L(KVM_CAP_STEAL_TIME),
-#ifdef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_VMM_TARGET_X86
+        CAP_ENTRY_ML(KVM_CAP_X86_USER_SPACE_MSR),            /* (since 5.10) */
+        CAP_ENTRY_ML(KVM_CAP_X86_MSR_FILTER),
+#else
         CAP_ENTRY__L(KVM_CAP_X86_USER_SPACE_MSR),            /* (since 5.10) */
         CAP_ENTRY__L(KVM_CAP_X86_MSR_FILTER),
-#else
-        CAP_ENTRY_ML(KVM_CAP_X86_USER_SPACE_MSR),            /* (since 5.10) */
-        CAP_ENTRY_ML(KVM_CAP_X86_MSR_FILTER),
 #endif
         CAP_ENTRY__L(KVM_CAP_ENFORCE_PV_FEATURE_CPUID),      /* 190 */