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

fix(darwin): emulate a CPU if attempting to run macOS in a VM

This commit is contained in:
Martin Wimpress 2024-05-16 09:48:33 +01:00 committed by Martin Wimpress
parent 6985a5f135
commit da42a211d6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
quickemu
View File

@ -630,7 +630,7 @@ function configure_os_quirks() {
# - https://stackoverflow.com/questions/60231203/qemu-qcow2-mmu-gva-to-gpa-crash-in-mac-os-x # - https://stackoverflow.com/questions/60231203/qemu-qcow2-mmu-gva-to-gpa-crash-in-mac-os-x
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
if [ "${HOST_CPU_VENDOR}" == "GenuineIntel" ]; then if [ "${HOST_CPU_VENDOR}" == "GenuineIntel" ] && [ -z "${HYPERVISOR}" ]; then
CPU="-cpu host,-pdpe1gb" CPU="-cpu host,-pdpe1gb"
else else
CPU="-cpu Haswell-v4,vendor=GenuineIntel,-pdpe1gb,+avx,+avx2,+sse,+sse2,+sse3,+sse4.2,vmware-cpuid-freq=on" CPU="-cpu Haswell-v4,vendor=GenuineIntel,-pdpe1gb,+avx,+avx2,+sse,+sse2,+sse3,+sse4.2,vmware-cpuid-freq=on"
@ -642,7 +642,7 @@ function configure_os_quirks() {
fi;; fi;;
catalina|big-sur|monterey) catalina|big-sur|monterey)
if check_cpu_flag sse4_2; then if check_cpu_flag sse4_2; then
if [ "${HOST_CPU_VENDOR}" == "GenuineIntel" ]; then if [ "${HOST_CPU_VENDOR}" == "GenuineIntel" ] && [ -z "${HYPERVISOR}" ]; then
CPU="-cpu host,-pdpe1gb" CPU="-cpu host,-pdpe1gb"
else else
CPU="-cpu Haswell-v4,vendor=GenuineIntel,-pdpe1gb,+avx,+sse,+sse2,+sse3,+sse4.2,vmware-cpuid-freq=on" CPU="-cpu Haswell-v4,vendor=GenuineIntel,-pdpe1gb,+avx,+sse,+sse2,+sse3,+sse4.2,vmware-cpuid-freq=on"
@ -653,7 +653,7 @@ function configure_os_quirks() {
fi;; fi;;
*) *)
if check_cpu_flag sse4_1; then if check_cpu_flag sse4_1; then
if [ "${HOST_CPU_VENDOR}" == "GenuineIntel" ]; then if [ "${HOST_CPU_VENDOR}" == "GenuineIntel" ] && [ -z "${HYPERVISOR}" ]; then
CPU="-cpu host,-pdpe1gb" CPU="-cpu host,-pdpe1gb"
else else
CPU="-cpu Penryn,vendor=GenuineIntel,-pdpe1gb,+avx,+sse,+sse2,+sse3,+sse4.1,vmware-cpuid-freq=on" CPU="-cpu Penryn,vendor=GenuineIntel,-pdpe1gb,+avx,+sse,+sse2,+sse3,+sse4.1,vmware-cpuid-freq=on"
@ -664,7 +664,7 @@ function configure_os_quirks() {
fi;; fi;;
esac esac
if [ "${HOST_CPU_VENDOR}" != "GenuineIntel" ]; then if [ "${HOST_CPU_VENDOR}" != "GenuineIntel" ] && [ -z "${HYPERVISOR}" ]; then
for FLAG in abm adx aes amd-ssbd bmi1 bmi2 cx8 eist ept_1gb f16c fma invtsc \ for FLAG in abm adx aes amd-ssbd bmi1 bmi2 cx8 eist ept_1gb f16c fma invtsc \
mmx movbe mpx pdpe1gb popcnt smep vaes vbmi2 vpclmulqdq \ mmx movbe mpx pdpe1gb popcnt smep vaes vbmi2 vpclmulqdq \
xgetbv1 xsave xsaveopt; do xgetbv1 xsave xsaveopt; do