Ticket #73519: qemu_10.2_monterey_arm64_fix.patch

target/arm/hvf/hvf.c

@@ -830 +830 @@
 uint32_t hvf_arm_get_default_ipa_bit_size(void)
 {
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
     uint32_t default_ipa_size;
     hv_return_t ret = hv_vm_config_get_default_ipa_size(&default_ipa_size);
     assert_hvf_ok(ret);
-
     return default_ipa_size;
+#else
+    /* hv_vm_config_get_default_ipa_size requires macOS 13+; on Monterey M1, default is 36 */
+    return 36;
+#endif
 }
 
 uint32_t hvf_arm_get_max_ipa_bit_size(void)
 {
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
     uint32_t max_ipa_size;
     hv_return_t ret = hv_vm_config_get_max_ipa_size(&max_ipa_size);
     assert_hvf_ok(ret);
 
     /*
      * We clamp any IPA size we want to back the VM with to a valid PARange
      * value so the guest doesn't try and map memory outside of the valid range.
      * This logic just clamps the passed in IPA bit size to the first valid
      * PARange value <= to it.
      */
     return round_down_to_parange_bit_size(max_ipa_size);