From c246d868672fca1ae2b0cd07d1f78a388c9303dd Mon Sep 17 00:00:00 2001 From: Liav A Date: Fri, 18 Mar 2022 16:52:04 +0200 Subject: [PATCH] Meta: Use VMWare SVGA adapter if running QEMU Q35 machine This let us test the VMWare SVGA adapter easily. We already use the std vga (which is compatible with bochs-display that only lacks VGA support) on the i440FX QEMU machine so we keep testing it there too, and on the Q35 machine we use a bochs-display device as secondary display. --- Meta/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Meta/run.sh b/Meta/run.sh index 01de203542..49bdc613c8 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -347,7 +347,7 @@ $SERENITY_EXTRA_QEMU_ARGS -d guest_errors -smp $SERENITY_CPUS -vga none --device bochs-display +-device vmware-svga -device ich9-usb-ehci1,bus=pcie.0,multifunction=on,addr=0x5.0x0 -device ich9-usb-ehci2,bus=pcie.0,addr=0x5.0x2 -device ich9-usb-uhci1,bus=pcie.0,multifunction=on,addr=0x7.0x0 @@ -364,8 +364,8 @@ $SERENITY_EXTRA_QEMU_ARGS -device pcie-root-port,port=0x15,chassis=6,id=pcie.6,bus=pcie.0,addr=0x6.0x5 -device pcie-root-port,port=0x16,chassis=7,id=pcie.7,bus=pcie.0,addr=0x6.0x6 -device pcie-root-port,port=0x17,chassis=8,id=pcie.8,bus=pcie.0,addr=0x6.0x7 --device bochs-display,bus=pcie.6,addr=0x10.0x0 -device ich9-intel-hda,bus=pcie.2,addr=0x03.0x0 +-device bochs-display -device nec-usb-xhci,bus=pcie.2,addr=0x11.0x0 -device pci-bridge,chassis_nr=1,id=bridge1,bus=pcie.4,addr=0x3.0x0 -device sdhci-pci,bus=bridge1,addr=0x1.0x0