Changeset 105695 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 15, 2024 4:24:06 PM (4 months ago)

Author:

vboxsync

Message:

VMMArm/NEM: Resolve hv_vm_config_create() dynamically as it is only available since 13.0, fixes building with older SDKs, bugref:10747

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp

@@ -134 +134 @@
 #endif
 
-typedef hv_return_t FN_HV_VM_CONFIG_GET_EL2_SUPPORTED(bool *el2_supported);
-typedef hv_return_t FN_HV_VM_CONFIG_GET_EL2_ENABLED(hv_vm_config_t config, bool *el2_enabled);
-typedef hv_return_t FN_HV_VM_CONFIG_SET_EL2_ENABLED(hv_vm_config_t config, bool el2_enabled);
+typedef hv_vm_config_t  FN_HV_VM_CONFIG_CREATE(void);
+typedef hv_return_t     FN_HV_VM_CONFIG_GET_EL2_SUPPORTED(bool *el2_supported);
+typedef hv_return_t     FN_HV_VM_CONFIG_GET_EL2_ENABLED(hv_vm_config_t config, bool *el2_enabled);
+typedef hv_return_t     FN_HV_VM_CONFIG_SET_EL2_ENABLED(hv_vm_config_t config, bool el2_enabled);
 
 typedef struct hv_gic_config_s *hv_gic_config_t;
@@ -188 +189 @@
 /** @name Optional APIs imported from Hypervisor.framework.
  * @{ */
-static FN_HV_VM_CONFIG_GET_EL2_SUPPORTED *g_pfnHvVmConfigGetEl2Supported                        = NULL; /* Since 15.0 */
-static FN_HV_VM_CONFIG_GET_EL2_ENABLED   *g_pfnHvVmConfigGetEl2Enabled                          = NULL; /* Since 15.0 */
-static FN_HV_VM_CONFIG_SET_EL2_ENABLED   *g_pfnHvVmConfigSetEl2Enabled                          = NULL; /* Since 15.0 */
+static FN_HV_VM_CONFIG_CREATE                       *g_pfnHvVmConfigCreate                      = NULL; /* Since 13.0 */
+static FN_HV_VM_CONFIG_GET_EL2_SUPPORTED            *g_pfnHvVmConfigGetEl2Supported             = NULL; /* Since 15.0 */
+static FN_HV_VM_CONFIG_GET_EL2_ENABLED              *g_pfnHvVmConfigGetEl2Enabled               = NULL; /* Since 15.0 */
+static FN_HV_VM_CONFIG_SET_EL2_ENABLED              *g_pfnHvVmConfigSetEl2Enabled               = NULL; /* Since 15.0 */
 
 static FN_HV_GIC_CREATE                             *g_pfnHvGicCreate                           = NULL; /* Since 15.0 */
@@ -240 +242 @@
 {
 #define NEM_DARWIN_IMPORT(a_Pfn, a_Name) { (void **)&(a_Pfn), #a_Name }
+    NEM_DARWIN_IMPORT(g_pfnHvVmConfigCreate,                    hv_vm_config_create),
     NEM_DARWIN_IMPORT(g_pfnHvVmConfigGetEl2Supported,           hv_vm_config_get_el2_supported),
     NEM_DARWIN_IMPORT(g_pfnHvVmConfigGetEl2Enabled,             hv_vm_config_get_el2_enabled),
@@ -287 +290 @@
  */
 #ifndef IN_SLICKEDIT
+# define hv_vm_config_create                        g_pfnHvVmConfigCreate
 # define hv_vm_config_get_el2_supported             g_pfnHvVmConfigGetEl2Supported
 # define hv_vm_config_get_el2_enabled               g_pfnHvVmConfigGetEl2Enabled
@@ -1247 +1251 @@
      */
     PCFGMNODE pCfgCpum = CFGMR3GetChild(CFGMR3GetRoot(pVM), "CPUM/");
-    hv_vm_config_t hVmCfg = hv_vm_config_create();
-
-    if (hv_vm_config_get_el2_supported)
-    {
+    hv_vm_config_t hVmCfg = NULL;
+
+    if (   hv_vm_config_create
+        && hv_vm_config_get_el2_supported)
+    {
+        hVmCfg = hv_vm_config_create();
+
         bool fHvEl2Supported = false;
         hv_return_t hrc = hv_vm_config_get_el2_supported(&fHvEl2Supported);