RomanNum3ral
/
quickemu
mirror of https://github.com/quickemu-project/quickemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: update cpu characteristics for macOS. close #1114

This commit is contained in:
Martin Wimpress 2024-05-09 00:09:24 +01:00 committed by Martin Wimpress
parent 6c2aad8e4d
commit 5e507e645c
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
quickemu
View File

@ -526,6 +526,7 @@ function vm_boot() {
macos) macos)
# https://www.nicksherlock.com/2020/04/installing-macos-catalina-on-proxmox-with-opencore/ # https://www.nicksherlock.com/2020/04/installing-macos-catalina-on-proxmox-with-opencore/
# https://www.nicksherlock.com/2022/10/installing-macos-13-ventura-on-proxmox/ # https://www.nicksherlock.com/2022/10/installing-macos-13-ventura-on-proxmox/
# noTSX stops cpuid errors https://duckduckgo.com/?t=ffab&q=CPUID.07H%3AEBX.rtm+%5Bbit+11%5D&ia=web also cited by NickSherlock for Ventura install
# Penryn https://github.com/search?q=repo%3Akholia%2FOSX-KVM%20%20GenuineIntel&type=code # Penryn https://github.com/search?q=repo%3Akholia%2FOSX-KVM%20%20GenuineIntel&type=code
# https://en.wikipedia.org/wiki/MacOS_version_history#Releases # https://en.wikipedia.org/wiki/MacOS_version_history#Releases
# quickget current list: high-sierra mojave catalina big-sur monterey ventura sonoma # quickget current list: high-sierra mojave catalina big-sur monterey ventura sonoma
@ -535,8 +536,7 @@ function vm_boot() {
case ${macos_release} in case ${macos_release} in
ventura|sonoma) ventura|sonoma)
if check_cpu_flag sse4_2 && check_cpu_flag avx2; then if check_cpu_flag sse4_2 && check_cpu_flag avx2; then
# noTSX stops cpuid errors https://duckduckgo.com/?t=ffab&q=CPUID.07H%3AEBX.rtm+%5Bbit+11%5D&ia=web also cited by NickSherlock for Ventura install CPU="-cpu Haswell-v4,kvm=on,vendor=GenuineIntel,+avx,+avx2,+sse,+sse2,+sse3,+sse4.2,vmware-cpuid-freq=on"
CPU="-cpu Haswell-noTSX-IBRS,kvm=on,vendor=GenuineIntel,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc"
else else
echo "ERROR! macOS ${macos_release} requires a CPU with SSE 4.2 and AVX2 support." echo "ERROR! macOS ${macos_release} requires a CPU with SSE 4.2 and AVX2 support."
exit 1 exit 1
@ -544,9 +544,7 @@ function vm_boot() {
;; ;;
catalina|big-sur|monterey) catalina|big-sur|monterey)
if check_cpu_flag sse4_2; then if check_cpu_flag sse4_2; then
# Used in past versions: +movbe,+smep,+xgetbv1,+xsavec,+avx2 CPU="-cpu Haswell-v4,kvm=on,vendor=GenuineIntel,+avx,+sse,+sse2,+sse3,+sse4.2,vmware-cpuid-freq=on"
# Warn on AMD: +fma4,+pcid
CPU="-cpu Haswell-noTSX-IBRS,kvm=on,vendor=GenuineIntel,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc"
else else
echo "ERROR! macOS ${macos_release} requires a CPU with SSE 4.2 support." echo "ERROR! macOS ${macos_release} requires a CPU with SSE 4.2 support."
exit 1 exit 1
@ -554,8 +552,7 @@ function vm_boot() {
;; ;;
*) *)
if check_cpu_flag sse4_1; then if check_cpu_flag sse4_1; then
# as above but 4.1 (for older hosts) CPU="-cpu Penryn,kvm=on,vendor=GenuineIntel,+avx,+sse,+sse2,+sse3,+sse4.1,vmware-cpuid-freq=on"
CPU="-cpu Penryn,kvm=on,vendor=GenuineIntel,+aes,+avx,+bmi1,+bmi2,+fma,+hypervisor,+invtsc,+kvm_pv_eoi,+kvm_pv_unhalt,+popcnt,+ssse3,+sse4.1,vmware-cpuid-freq=on,+xsave,+xsaveopt,check"
else else
echo "ERROR! macOS ${macos_release} requires a CPU with SSE 4.1 support." echo "ERROR! macOS ${macos_release} requires a CPU with SSE 4.1 support."
exit 1 exit 1
@ -563,6 +560,19 @@ function vm_boot() {
;; ;;
esac esac
# https://www.techpowerup.com/cpu-specs/xeon-w-2140b.c2953 8 cores 16 threads # skylake server
# https://en.wikipedia.org/wiki/IMac_Pro#Technical_specifications Orig: High Sierra Max: Sonoma
# https://en.wikipedia.org/wiki/MacOS#Hardware_compatibility needs 8GB RAM
# https://qemu.readthedocs.io/en/v9.0.0/system/qemu-cpu-models.html#important-cpu-features-for-amd-x86-hosts
# https://www.reddit.com/r/hackintosh/comments/141wnjk/state_of_macos_14_sonoma_on_x86/
for FLAG in abm adx aes amd-ssbd bmi1 bmi2 cx8 eist ept f16c fma invtsc \
mmx movbe mpx pdpe1gb smep vaes vbmi2 vpclmulqdq \
xgetbv1 xsave xsaveopt; do
if check_cpu_flag "${FLAG}"; then
CPU+=",+${FLAG}"
fi
done
OSK=$(echo "bheuneqjbexolgurfrjbeqfthneqrqcyrnfrqbagfgrny(p)NccyrPbzchgreVap" | tr 'A-Za-z' 'N-ZA-Mn-za-m') OSK=$(echo "bheuneqjbexolgurfrjbeqfthneqrqcyrnfrqbagfgrny(p)NccyrPbzchgreVap" | tr 'A-Za-z' 'N-ZA-Mn-za-m')
# Disable S3 support in the VM to prevent macOS suspending during install # Disable S3 support in the VM to prevent macOS suspending during install
GUEST_TWEAKS="-global kvm-pit.lost_tick_policy=discard -global ICH9-LPC.disable_s3=1 -device isa-applesmc,osk=${OSK}" GUEST_TWEAKS="-global kvm-pit.lost_tick_policy=discard -global ICH9-LPC.disable_s3=1 -device isa-applesmc,osk=${OSK}"