diff options
| author | Nico Weber <thakis@chromium.org> | 2021-09-06 13:26:58 -0400 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-09-06 21:57:59 +0100 |
| commit | f1d1418256639775bfcafff51bbe920df4a30e65 (patch) | |
| tree | 199663aa0fb9743ff93b7af6ac028562268618f4 | |
| parent | 95ff65e211bae8c57b06765b431bed7053f3c3e4 (diff) | |
| download | serenity-f1d1418256639775bfcafff51bbe920df4a30e65.zip | |
Meta: Unbreak `serenity.sh run aarch64` after 918f7cb4a88
| -rwxr-xr-x | Meta/run.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index 67c099a2b1..179743eb9e 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -123,13 +123,14 @@ if command -v wslpath >/dev/null; then fi [ -z "$SERENITY_QEMU_CPU" ] && SERENITY_QEMU_CPU="max" -[ -z "$SERENITY_CPUS" ] && SERENITY_CPUS="2" -if [ "$SERENITY_CPUS" -le 8 ]; then - # Explicitly disable x2APIC so we can test it more easily - SERENITY_QEMU_CPU="$SERENITY_QEMU_CPU,-x2apic" -fi if [ "$SERENITY_ARCH" != "aarch64" ]; then + [ -z "$SERENITY_CPUS" ] && SERENITY_CPUS="2" + if [ "$SERENITY_CPUS" -le 8 ]; then + # Explicitly disable x2APIC so we can test it more easily + SERENITY_QEMU_CPU="$SERENITY_QEMU_CPU,-x2apic" + fi + if [ -z "$SERENITY_SPICE" ] && "${SERENITY_QEMU_BIN}" -chardev help | grep -iq qemu-vdagent; then SERENITY_SPICE_SERVER_CHARDEV="-chardev qemu-vdagent,clipboard=on,mouse=off,id=vdagent,name=vdagent" elif "${SERENITY_QEMU_BIN}" -chardev help | grep -iq spicevmc; then |