Changeset 108968 in vbox for trunk/include

Timestamp:

Apr 14, 2025 8:45:36 PM (3 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168488

Message:

VMM,Main,Devices: Respect VBOX_VMM_TARGET_ARMV8 correctly on amd64 hosts (for IEM debugging purposes). jiraref:VBP-1598

Location:

trunk/include/VBox

Files:

: 8 edited

err.h (modified) (2 diffs)
param.h (modified) (1 diff)
types.h (modified) (1 diff)
vmm/cpum-x86-amd64.h (modified) (1 diff)
vmm/cpum.h (modified) (1 diff)
vmm/cpumctx-x86-amd64.h (modified) (1 diff)
vmm/cpumctx.h (modified) (1 diff)
vmm/vm.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/include/VBox/err.h

-              r107893
+              r108968
 /** Cannot block in ring-0. */
 #define VERR_VMM_CANNOT_BLOCK               (-2720)
+/** The ring-0 function is not supported for this VM target.   */
+#define VERR_VMM_FN_NOT_SUPPORTED_FOR_VMTARGET      (-2721)
 /** @} */
 …
 #define VINF_GVM_YIELDED                            3903
 /** Mismatching VM structure size between VMMR0 and VBoxVMM. */
 #define VINF_GVM_MISMATCH_VM_SIZE                   (-3904)
+#define VERR_GVM_MISMATCH_VM_SIZE                   (-3904)
 /** Mismatching VMCPU structure size between VMMR0 and VBoxVMM. */
 #define VINF_GVM_MISMATCH_VMCPU_SIZE                (-3905)
+#define VERR_GVM_MISMATCH_VMCPU_SIZE                (-3905)
 /** Mismatching VM structure version between VMMR0 and VBoxVMM. */
 #define VINF_GVM_MISMATCH_VM_STRUCT_VER             (-3906)
+#define VERR_GVM_MISMATCH_VM_STRUCT_VER             (-3906)
 /** Mismatching SVN revision number between VMMR0 and VBoxVMM. */
 #define VINF_GVM_MISMATCH_SVN_REV                   (-3907)
+#define VERR_GVM_MISMATCH_SVN_REV                   (-3907)
 /** @} */

trunk/include/VBox/param.h

r108736	r108968
139	139	&& defined(RT_ARCH_AMD64) /* ASM-NOINC */ \
140	140	&& (defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX) \|\| defined(RT_OS_SOLARIS) \|\| defined(RT_OS_WINDOWS)) ) /* ASM-NOINC */ \
	141	&& (defined(VBOX_VMM_TARGET_X86) \|\| defined(VBOX_VMM_TARGET_AGNOSTIC)) /* quick hack */ \
141	142	\|\| defined(DOXYGEN_RUNNING) /* ASM-NOINC */
142	143	# define VBOX_WITH_PAGE_SHARING /* ASM-NOINC */

trunk/include/VBox/types.h

-              r107893
+              r108968
 #elif defined(VBOX_VMM_TARGET_ARMV8)
 # define VMTARGET_DEFAULT   VMTARGET_ARMV8
+#endif
+/** @def VMTARGET_NATIVE
+ * The native target according to the RT_ARCH_XXX defines. */
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) || defined(DOXYGEN_RUNNING)
+# define VMTARGET_NATIVE    VMTARGET_X86
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+# define VMTARGET_NATIVE    VMTARGET_ARMV8
 #endif

trunk/include/VBox/vmm/cpum-x86-amd64.h

-              r107650
+              r108968
 } CPUMCPUIDFEATURE;
-/**
- * CPUID leaf.
+ *
- * @remarks This structure is used by the patch manager and is therefore
- *          more or less set in stone.
- */
-typedef struct CPUMCPUIDLEAF
+{
-    /** The leaf number. */
-    uint32_t    uLeaf;
-    /** The sub-leaf number. */
-    uint32_t    uSubLeaf;
-    /** Sub-leaf mask.  This is 0 when sub-leaves aren't used. */
-    uint32_t    fSubLeafMask;
-    /** The EAX value. */
-    uint32_t    uEax;
-    /** The EBX value. */
-    uint32_t    uEbx;
-    /** The ECX value. */
-    uint32_t    uEcx;
-    /** The EDX value. */
-    uint32_t    uEdx;
-    /** Flags. */
-    uint32_t    fFlags;
-} CPUMCPUIDLEAF;
-#ifndef VBOX_FOR_DTRACE_LIB
-AssertCompileSize(CPUMCPUIDLEAF, 32);
-#endif
-/** Pointer to a CPUID leaf. */
-typedef CPUMCPUIDLEAF *PCPUMCPUIDLEAF;
-/** Pointer to a const CPUID leaf. */
-typedef CPUMCPUIDLEAF const *PCCPUMCPUIDLEAF;
-/** @name CPUMCPUIDLEAF::fFlags
- * @{ */
-/** Indicates working intel leaf 0xb where the lower 8 ECX bits are not modified
- * and EDX containing the extended APIC ID. */
-#define CPUMCPUIDLEAF_F_INTEL_TOPOLOGY_SUBLEAVES    RT_BIT_32(0)
-/** The leaf contains an APIC ID that needs changing to that of the current CPU. */
-#define CPUMCPUIDLEAF_F_CONTAINS_APIC_ID            RT_BIT_32(1)
-/** The leaf contains an OSXSAVE which needs individual handling on each CPU. */
-#define CPUMCPUIDLEAF_F_CONTAINS_OSXSAVE            RT_BIT_32(2)
-/** The leaf contains an APIC feature bit which is tied to APICBASE.EN. */
-#define CPUMCPUIDLEAF_F_CONTAINS_APIC               RT_BIT_32(3)
-/** Mask of the valid flags. */
-#define CPUMCPUIDLEAF_F_VALID_MASK                  UINT32_C(0xf)
-/** @} */
 /**

trunk/include/VBox/vmm/cpum.h

-              r107854
+              r108968
+/**
+ * CPUID leaf on x86.
+ * @note Used by both x86 hosts and guest.
+ * @todo s/CPUMCPUIDLEAF/CPUMX86CPUIDLEAF/
+ */
+typedef struct CPUMCPUIDLEAF
+{
+    /** The leaf number. */
+    uint32_t    uLeaf;
+    /** The sub-leaf number. */
+    uint32_t    uSubLeaf;
+    /** Sub-leaf mask.  This is 0 when sub-leaves aren't used. */
+    uint32_t    fSubLeafMask;
+    /** The EAX value. */
+    uint32_t    uEax;
+    /** The EBX value. */
+    uint32_t    uEbx;
+    /** The ECX value. */
+    uint32_t    uEcx;
+    /** The EDX value. */
+    uint32_t    uEdx;
+    /** Flags. */
+    uint32_t    fFlags;
+} CPUMCPUIDLEAF;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(CPUMCPUIDLEAF, 32);
+#endif
+/** Pointer to a CPUID leaf. */
+typedef CPUMCPUIDLEAF *PCPUMCPUIDLEAF;
+/** Pointer to a const CPUID leaf. */
+typedef CPUMCPUIDLEAF const *PCCPUMCPUIDLEAF;
+/** @name CPUMCPUIDLEAF::fFlags
+ * @{ */
+/** Indicates working intel leaf 0xb where the lower 8 ECX bits are not modified
+ * and EDX containing the extended APIC ID. */
+#define CPUMCPUIDLEAF_F_INTEL_TOPOLOGY_SUBLEAVES    RT_BIT_32(0)
+/** The leaf contains an APIC ID that needs changing to that of the current CPU. */
+#define CPUMCPUIDLEAF_F_CONTAINS_APIC_ID            RT_BIT_32(1)
+/** The leaf contains an OSXSAVE which needs individual handling on each CPU. */
+#define CPUMCPUIDLEAF_F_CONTAINS_OSXSAVE            RT_BIT_32(2)
+/** The leaf contains an APIC feature bit which is tied to APICBASE.EN. */
+#define CPUMCPUIDLEAF_F_CONTAINS_APIC               RT_BIT_32(3)
+/** Mask of the valid flags. */
+#define CPUMCPUIDLEAF_F_VALID_MASK                  UINT32_C(0xf)
+/** @} */
 /**

trunk/include/VBox/vmm/cpumctx-x86-amd64.h

-              r106061
+              r108968
  * @deprecated  */
 typedef CPUMSELREG CPUMSELREGHID;
-/**
- * The sysenter register set.
- */
-typedef struct CPUMSYSENTER
+{
-    /** Ring 0 cs.
-     * This value +  8 is the Ring 0 ss.
-     * This value + 16 is the Ring 3 cs.
-     * This value + 24 is the Ring 3 ss.
-     */
-    uint64_t    cs;
-    /** Ring 0 eip. */
-    uint64_t    eip;
-    /** Ring 0 esp. */
-    uint64_t    esp;
-} CPUMSYSENTER;
 /** A general register (union). */

trunk/include/VBox/vmm/cpumctx.h

-              r106061
+              r108968
 #define CPUM_UNION_STRUCT_NM(a_UnionNm, a_StructNm) CPUM_UNION_NM(a_UnionNm .) CPUM_STRUCT_NM(a_StructNm)
+/**
+ * The x86 sysenter register set.
+ *
+ * @note Used by both x86 hosts and guest context structures.
+ * @todo s/CPUMSYSENTER/CPUMX86SYSENTER/
+ */
+typedef struct CPUMSYSENTER
+{
+    /** Ring 0 cs.
+     * This value +  8 is the Ring 0 ss.
+     * This value + 16 is the Ring 3 cs.
+     * This value + 24 is the Ring 3 ss.
+     */
+    uint64_t    cs;
+    /** Ring 0 eip. */
+    uint64_t    eip;
+    /** Ring 0 esp. */
+    uint64_t    esp;
+} CPUMSYSENTER;
 #ifdef VBOX_VMM_TARGET_ARMV8
 # include <VBox/vmm/cpumctx-armv8.h>

trunk/include/VBox/vmm/vm.h

-              r108708
+              r108968
                                      | VM_STRUCT_VERSION_F_29 \
                                      | VM_STRUCT_VERSION_F_28 )
+#endif
+# if (defined(RT_ARCH_AMD64) && defined(VBOX_WITH_VIRT_ARMV8) && defined(IN_RING0)) || defined(DOXYGEN_RUNNING)
+/** @def VM_STRUCT_VERSION_NON_NATIVE_TARGETS
+ * The current VM structure version for the other architecture (hack).
+ *
+ * Currently the VBoxVMMArm.dll/so/dylib on x86 differs from VM_STRUCT_VERSION
+ * in that it will have VBOX_WITH_ONLY_PGM_NEM_MODE & VBOX_WITH_MINIMAL_R0
+ * defined but not VBOX_WITH_HWVIRT.  This is to get the stuff off the ground
+ * quickly by emulating how it's built on win.arm64 hosts. */
+#  define VM_STRUCT_VERSION_NON_NATIVE_TARGETS \
+        (  (  VM_STRUCT_VERSION \
+            | RT_BIT_32(31) /*VBOX_WITH_MINIMAL_R0*/ \
+            | RT_BIT_32(30) /*VBOX_WITH_ONLY_PGM_NEM_MODE*/ ) \
+         & ~RT_BIT_32(28) /*VBOX_WITH_HWVIRT*/ )
+# endif
+/** @def VM_IS_NON_NATIVE_WITH_LIMITED_R0
+ * Whether the is a non-default targeted VM and should have the limited ring-0
+ * presence hack applied.
+ *
+ * This is typically used in ring-0 code to skip VM init and termination code.
+ *
+ * @param g_GVM  The ring-0 VM structure. */
+# ifdef VM_STRUCT_VERSION_NON_NATIVE_TARGETS
+#  define VM_IS_NON_NATIVE_WITH_LIMITED_R0(g_GVM)   (pGVM->enmTarget != VMTARGET_NATIVE)
+# else
+#  define VM_IS_NON_NATIVE_WITH_LIMITED_R0(g_GVM)   (false)
+# endif
+#endif
 #endif /* !VBOX_FOR_DTRACE_LIB */

Note: See TracChangeset for help on using the changeset viewer.

Changeset 108968 in vbox for trunk/include

Legend:

Download in other formats: