Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/67026?usp=email )
Change subject: util/qemu: Revise q35 configs ......................................................................
util/qemu: Revise q35 configs
Add an NVMe drive and be more conservative with hotplug-capable PCIe ports. QEMU treats everything as hotpluggable by default, so devices can be added at runtime. However, this leads to unrealistic resource allocations with PCIEXP_HOTPLUG enabled.
Tested recent allocator changes with QEMU/Q35 config and:
$ make qemu QEMU_EXTRA_CFGS=util/qemu/q35-alpine.cfg
Change-Id: I23746b642329356c6767b04ec177cd9411e3adb9 Signed-off-by: Nico Huber nico.h@gmx.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/67026 Reviewed-by: Felix Singer service+coreboot-gerrit@felixsinger.de Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Lean Sheng Tan sheng.tan@9elements.com --- M util/qemu/q35-alpine.cfg M util/qemu/q35-base.cfg 2 files changed, 14 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Lean Sheng Tan: Looks good to me, approved
diff --git a/util/qemu/q35-alpine.cfg b/util/qemu/q35-alpine.cfg index bcbde97..513f4d7 100644 --- a/util/qemu/q35-alpine.cfg +++ b/util/qemu/q35-alpine.cfg @@ -9,6 +9,7 @@ bus = "alpine-root" addr = "00.0" chassis = "10" + hotplug = "off"
[device "alpine-nhi"] driver = "pci-testdev" @@ -21,6 +22,7 @@ bus = "alpine-root" addr = "01.0" chassis = "11" + hotplug = "off"
[device "alpine-up"] driver = "x3130-upstream" @@ -48,6 +50,7 @@ bus = "alpine-up" addr = "04.0" chassis = "24" + hotplug = "off"
[device "alpine-xhci"] driver = "nec-usb-xhci" @@ -59,3 +62,4 @@ bus = "alpine-root" addr = "02.0" chassis = "12" + hotplug = "off" diff --git a/util/qemu/q35-base.cfg b/util/qemu/q35-base.cfg index 87dcfcd..53eef47 100644 --- a/util/qemu/q35-base.cfg +++ b/util/qemu/q35-base.cfg @@ -18,7 +18,13 @@ driver = "pcie-root-port" bus = "pcie.0" addr = "01.0" + hotplug = "off"
+[device "ssd"] + driver = "nvme" + bus = "q35-peg" + addr = "00.0" + serial = "0"
[device "q35-igpu"] driver = "VGA" @@ -85,6 +91,7 @@ addr = "1c.0" port = "1" chassis = "1" + hotplug = "off"
[device "ich9-pcie-port-2"] driver = "ioh3420" @@ -93,6 +100,7 @@ addr = "1c.1" port = "2" chassis = "2" + hotplug = "off"
[device "ich9-pcie-port-3"] driver = "ioh3420" @@ -101,6 +109,7 @@ addr = "1c.2" port = "3" chassis = "3" + hotplug = "off"
[device "ich9-pcie-port-4"] driver = "ioh3420" @@ -109,6 +118,7 @@ addr = "1c.3" port = "4" chassis = "4" + hotplug = "off"
[device "ich9-pcie-port-5"] driver = "ioh3420"