aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsickcodes <[email protected]>2021-07-09 01:37:30 +0000
committerGitHub <[email protected]>2021-07-09 01:37:30 +0000
commit1b55c6e7e51b0be4c49f2563eeddbd639945c7e7 (patch)
treee01b18bb1f7c796c6f3f5917fd4889c57d7fc0e9
parentRemove GitHub action for building (diff)
downloaddocker-osx-cpu-max-features.tar.xz
docker-osx-cpu-max-features.zip
Change `Penryn` to `max`cpu-max-features
As stated in QEMU 6 Can test currently with: `-e CPU=max \` ``` [user@hostname ~]$ qemu-system-x86_64 -cpu help x86 Penryn (alias configured by machine type) x86 Penryn-v1 Intel Core 2 Duo P9xxx (Penryn Class Core 2) ... x86 base base CPU model type with no features enabled x86 host KVM processor with all supported host features x86 max Enables all features supported by the accelerator in the current host ``` See https://github.com/sickcodes/Docker-OSX/issues/304
-rw-r--r--Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 53f7b59..c885dda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -219,7 +219,7 @@ RUN touch Launch.sh \
&& tee -a Launch.sh <<< '[[ "${RAM}" = half ]] && export RAM="$(("$(head -n1 /proc/meminfo | tr -dc "[:digit:]") / 2000000"))"' \
&& tee -a Launch.sh <<< 'sudo chown -R $(id -u):$(id -g) /dev/snd 2>/dev/null || true' \
&& tee -a Launch.sh <<< 'exec qemu-system-x86_64 -m ${RAM:-2}000 \' \
- && tee -a Launch.sh <<< '-cpu ${CPU:-Penryn},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,}${BOOT_ARGS} \' \
+ && tee -a Launch.sh <<< '-cpu ${CPU:-max},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,}${BOOT_ARGS} \' \
&& tee -a Launch.sh <<< '-machine q35,${KVM-"accel=kvm:tcg"} \' \
&& tee -a Launch.sh <<< '-smp ${CPU_STRING:-${SMP:-4},cores=${CORES:-4}} \' \
&& tee -a Launch.sh <<< '-usb -device usb-kbd -device usb-tablet \' \
@@ -264,7 +264,7 @@ ENV BOOT_ARGS=
ENV BOOTDISK=
# edit the CPU that is being emulated
-ENV CPU=Penryn
+ENV CPU=max
ENV CPUID_FLAGS='vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,'
ENV DISPLAY=:0.0