diff options
| author | sickcodes <[email protected]> | 2021-07-25 20:35:54 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-07-25 20:35:54 +0000 |
| commit | d2dadeea4dbe0e8917ce1a402c6a32c990d9e13a (patch) | |
| tree | 2a82090b7d5ee7b0046868691252983e78420155 | |
| parent | Merge pull request #321 from sickcodes/glibc-revert-wip-2 (diff) | |
| download | docker-osx-d2dadeea4dbe0e8917ce1a402c6a32c990d9e13a.tar.xz docker-osx-d2dadeea4dbe0e8917ce1a402c6a32c990d9e13a.zip | |
Remove `+pcid` from boot args. Submodule update.
| -rw-r--r-- | Dockerfile | 4 | ||||
| m--------- | osx-serial-generator | 0 |
2 files changed, 2 insertions, 2 deletions
@@ -188,7 +188,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:-Penryn},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+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 \' \ @@ -235,7 +235,7 @@ ENV BOOTDISK= # edit the CPU that is being emulated ENV CPU=Penryn -ENV CPUID_FLAGS='vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,' +ENV CPUID_FLAGS='vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,' ENV DISPLAY=:0.0 diff --git a/osx-serial-generator b/osx-serial-generator -Subproject f7628e65fd33598083c498849435e99860e41b3 +Subproject f8497bee65d5725f97d1ed79ecf7300fc8c9990 |