diff --git a/Meta/run.sh b/Meta/run.sh index 7842c45e20..67c099a2b1 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -124,6 +124,10 @@ 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 if [ -z "$SERENITY_SPICE" ] && "${SERENITY_QEMU_BIN}" -chardev help | grep -iq qemu-vdagent; then