diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2023-05-11 21:58:22 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2023-05-17 08:53:57 +0200 |
| commit | 7ab0de9190db45a214b50de5d091c44d74ad06c3 (patch) | |
| tree | 97748597391d354a1b25b498b0fbd910852af78a | |
| parent | c61bb1706f4fd4bdc6363df93e0d8f31709123ff (diff) | |
| download | serenity-7ab0de9190db45a214b50de5d091c44d74ad06c3.zip | |
Meta: Only enable the SPICE server when using the SPICE display
Newer versions of QEMU prevent the user from running a GL-rendered
display while a SPICE display is active due to incompatibilities.
Since there is no way to disable QEMUs (apparently implicit) SPICE
display, make sure that we only enable SPICE support if the user
requested running with SPICE specifically. In this case, QEMU picks the
default SPICE client instead of rendering a display using whatever our
default on that platform would be.
| -rwxr-xr-x | Meta/run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index a2b366dc78..0115adc726 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -351,7 +351,7 @@ $SERENITY_SPICE_SERVER_CHARDEV " if [ "$SERENITY_ARCH" != "aarch64" ]; then - if "${SERENITY_QEMU_BIN}" -chardev help | grep -iq spice; then + if [ "${SERENITY_SPICE}" ] && "${SERENITY_QEMU_BIN}" -chardev help | grep -iq spice; then SERENITY_COMMON_QEMU_ARGS="$SERENITY_COMMON_QEMU_ARGS -spice port=5930,agent-mouse=off,disable-ticketing=on " |