diff options
| author | x-yl <kylepereira@mail.com> | 2021-07-14 19:01:41 +0400 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-07-14 17:17:06 +0200 |
| commit | 410eb9e9ffd46b77a8074faaae0bb570bb2b33a8 (patch) | |
| tree | fcd100e5ec1a56691a6e7784ba1330aff5365ae3 /Meta | |
| parent | f7acd6aca52f16076232d3a95eccbe3f896252cb (diff) | |
| download | serenity-410eb9e9ffd46b77a8074faaae0bb570bb2b33a8.zip | |
Meta: Don't use SPICE if QEMU doesn't support it
I do seem to have a tendency for breaking everyone's builds :/
Diffstat (limited to 'Meta')
| -rwxr-xr-x | Meta/run.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index b3ba72cea4..ad908d9282 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -139,7 +139,6 @@ $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 @@ -147,9 +146,15 @@ $SERENITY_SPICE_SERVER_CHARDEV -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 |