From cca1498e09aa8c4828ce37fab757c8dc6cd1da11 Mon Sep 17 00:00:00 2001 From: Liav A Date: Tue, 3 Aug 2021 22:00:11 +0300 Subject: [PATCH] Meta: Make the Q35 machine more realistic Although it is nice to test the system without too many devices, in reality bare metal hardware is far more complex than the default skeleon that QEMU provides. As a preparation of supporting more devices, we need to ensure we are capable of at least booting on complex hardware setups without easily-observable problems. Later on, this can be the foundations of testing new drivers :^) --- Meta/run.sh | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/Meta/run.sh b/Meta/run.sh index 770f9fd645..1ce2183bbe 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -189,21 +189,34 @@ $SERENITY_EXTRA_QEMU_ARGS -machine q35 -d guest_errors -smp 2 --device pcie-root-port,port=0x10,chassis=1,id=pcie.1,bus=pcie.0,multifunction=on,addr=0x2 --device pcie-root-port,port=0x11,chassis=2,id=pcie.2,bus=pcie.0,addr=0x2.0x1 --device pcie-root-port,port=0x12,chassis=3,id=pcie.3,bus=pcie.0,addr=0x2.0x2 --device pcie-root-port,port=0x13,chassis=4,id=pcie.4,bus=pcie.0,addr=0x2.0x3 --device pcie-root-port,port=0x14,chassis=5,id=pcie.5,bus=pcie.0,addr=0x2.0x4 --device pcie-root-port,port=0x15,chassis=6,id=pcie.6,bus=pcie.0,addr=0x2.0x5 +-device secondary-vga +-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 +-device ich9-usb-uhci2,bus=pcie.0,addr=0x7.0x1 +-device ich9-usb-uhci3,bus=pcie.0,addr=0x7.0x2 +-device ich9-usb-uhci4,bus=pcie.0,addr=0x7.0x3 +-device ich9-usb-uhci5,bus=pcie.0,addr=0x7.0x4 +-device ich9-usb-uhci6,bus=pcie.0,addr=0x7.0x5 +-device pcie-root-port,port=0x10,chassis=1,id=pcie.1,bus=pcie.0,multifunction=on,addr=0x6 +-device pcie-root-port,port=0x11,chassis=2,id=pcie.2,bus=pcie.0,addr=0x6.0x1 +-device pcie-root-port,port=0x12,chassis=3,id=pcie.3,bus=pcie.0,addr=0x6.0x2 +-device pcie-root-port,port=0x13,chassis=4,id=pcie.4,bus=pcie.0,addr=0x6.0x3 +-device pcie-root-port,port=0x14,chassis=5,id=pcie.5,bus=pcie.0,addr=0x6.0x4 +-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 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 -display $SERENITY_QEMU_DISPLAY_BACKEND -device $SERENITY_QEMU_DISPLAY_DEVICE --device secondary-vga --device bochs-display,bus=pcie.6,addr=0x10.0x0 -device piix3-ide -drive file=${SERENITY_DISK_IMAGE},format=raw,id=disk,if=none -device ahci,id=ahci -device ide-hd,bus=ahci.0,drive=disk,unit=0 --usb -device virtio-serial -chardev stdio,id=stdout,mux=on -device virtconsole,chardev=stdout