ソースを参照

Meta: Don't use SPICE if QEMU doesn't support it

I do seem to have a tendency for breaking everyone's builds :/
x-yl 4 年 前
コミット
410eb9e9ff
1 ファイル変更7 行追加2 行削除
  1. 7 2
      Meta/run.sh

+ 7 - 2
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