Skip to content

Commit

Permalink
Meta: Don't use SPICE if QEMU doesn't support it
Browse files Browse the repository at this point in the history
I do seem to have a tendency for breaking everyone's builds :/
  • Loading branch information
X-yl authored and awesomekling committed Jul 14, 2021
1 parent f7acd6a commit 410eb9e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Meta/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,22 @@ $SERENITY_SPICE_SERVER_CHARDEV
-chardev stdio,id=stdout,mux=on
-device virtconsole,chardev=stdout
-device isa-debugcon,chardev=stdout
-device virtserialport,chardev=vdagent,nr=1
-device virtio-rng-pci
-soundhw pcspk
-device sb16
-device pci-bridge,chassis_nr=1,id=bridge1 -device e1000,bus=bridge1
-device i82801b11-bridge,bus=bridge1,id=bridge2 -device sdhci-pci,bus=bridge2
-device i82801b11-bridge,id=bridge3 -device sdhci-pci,bus=bridge3
-device ich9-ahci,bus=bridge3
-spice port=5930,agent-mouse=off,disable-ticketing=on
"

if "${SERENITY_QEMU_BIN}" --help | grep -iq spice; then
SERENITY_COMMON_QEMU_ARGS="$SERENITY_COMMON_QEMU_ARGS
-spice port=5930,agent-mouse=off,disable-ticketing=on
-device virtserialport,chardev=vdagent,nr=1
"
fi

[ -z "$SERENITY_COMMON_QEMU_Q35_ARGS" ] && SERENITY_COMMON_QEMU_Q35_ARGS="
$SERENITY_EXTRA_QEMU_ARGS
-m $SERENITY_RAM_SIZE
Expand Down

0 comments on commit 410eb9e

Please sign in to comment.