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>
		
			
				
	
	
		
			191 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			INI
		
	
	
	
	
	
			
		
		
	
	
			191 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			INI
		
	
	
	
	
	
| # $ qemu-system-x86_64 -nodefaults -readconfig q35-base.cfg -readconfig ...
 | |
| #
 | |
| # Devices that show up even with `-nodefaults`:
 | |
| #   00.0 Host bridge
 | |
| #   1f.0 LPC bridge
 | |
| #   1f.2 SATA controller (AHCI mode)
 | |
| #   1f.3 SMBus controller
 | |
| 
 | |
| [machine]
 | |
| 	type = "q35"
 | |
| 	accel = "kvm:tcg"
 | |
| 
 | |
| [memory]
 | |
| 	size = "1024"
 | |
| 
 | |
| 
 | |
| [device "q35-peg"]
 | |
| 	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"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "02.0"
 | |
| 
 | |
| 
 | |
| [netdev "hostnet"]
 | |
| 	type = "user"
 | |
| 
 | |
| [device "net"]
 | |
| 	driver = "e1000"
 | |
| 	netdev = "hostnet"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "19.0"
 | |
| 
 | |
| 
 | |
| [device "ich9-ehci-2"]
 | |
| 	driver = "ich9-usb-ehci2"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1a.7"
 | |
| 
 | |
| [device "ich9-uhci-4"]
 | |
| 	driver = "ich9-usb-uhci4"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1a.0"
 | |
| 	masterbus = "ich9-ehci-2.0"
 | |
| 	firstport = "0"
 | |
| 
 | |
| [device "ich9-uhci-5"]
 | |
| 	driver = "ich9-usb-uhci5"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1a.1"
 | |
| 	masterbus = "ich9-ehci-2.0"
 | |
| 	firstport = "2"
 | |
| 
 | |
| [device "ich9-uhci-6"]
 | |
| 	driver = "ich9-usb-uhci6"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1a.2"
 | |
| 	masterbus = "ich9-ehci-2.0"
 | |
| 	firstport = "4"
 | |
| 
 | |
| 
 | |
| [device "ich9-hda-audio"]
 | |
| 	driver = "ich9-intel-hda"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1b.0"
 | |
| 
 | |
| [device "ich9-hda-duplex"]
 | |
| 	driver = "hda-duplex"
 | |
| 	bus = "ich9-hda-audio.0"
 | |
| 	cad = "0"
 | |
| 
 | |
| 
 | |
| [device "ich9-pcie-port-1"]
 | |
| 	driver = "ioh3420"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1c.0"
 | |
| 	port = "1"
 | |
| 	chassis = "1"
 | |
| 	hotplug = "off"
 | |
| 
 | |
| [device "ich9-pcie-port-2"]
 | |
| 	driver = "ioh3420"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1c.1"
 | |
| 	port = "2"
 | |
| 	chassis = "2"
 | |
| 	hotplug = "off"
 | |
| 
 | |
| [device "ich9-pcie-port-3"]
 | |
| 	driver = "ioh3420"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1c.2"
 | |
| 	port = "3"
 | |
| 	chassis = "3"
 | |
| 	hotplug = "off"
 | |
| 
 | |
| [device "ich9-pcie-port-4"]
 | |
| 	driver = "ioh3420"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1c.3"
 | |
| 	port = "4"
 | |
| 	chassis = "4"
 | |
| 	hotplug = "off"
 | |
| 
 | |
| [device "ich9-pcie-port-5"]
 | |
| 	driver = "ioh3420"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1c.4"
 | |
| 	port = "5"
 | |
| 	chassis = "5"
 | |
| 
 | |
| [device "ich9-pcie-port-6"]
 | |
| 	driver = "ioh3420"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1c.5"
 | |
| 	port = "6"
 | |
| 	chassis = "6"
 | |
| 
 | |
| [device "ich9-pcie-port-7"]
 | |
| 	driver = "ioh3420"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1c.6"
 | |
| 	port = "7"
 | |
| 	chassis = "7"
 | |
| 
 | |
| [device "ich9-pcie-port-8"]
 | |
| 	driver = "ioh3420"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1c.7"
 | |
| 	port = "8"
 | |
| 	chassis = "8"
 | |
| 
 | |
| 
 | |
| [device "ich9-ehci-1"]
 | |
| 	driver = "ich9-usb-ehci1"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1d.7"
 | |
| 
 | |
| [device "ich9-uhci-1"]
 | |
| 	driver = "ich9-usb-uhci1"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1d.0"
 | |
| 	masterbus = "ich9-ehci-1.0"
 | |
| 	firstport = "0"
 | |
| 
 | |
| [device "ich9-uhci-2"]
 | |
| 	driver = "ich9-usb-uhci2"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1d.1"
 | |
| 	masterbus = "ich9-ehci-1.0"
 | |
| 	firstport = "2"
 | |
| 
 | |
| [device "ich9-uhci-3"]
 | |
| 	driver = "ich9-usb-uhci3"
 | |
| 	multifunction = "on"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1d.2"
 | |
| 	masterbus = "ich9-ehci-1.0"
 | |
| 	firstport = "4"
 | |
| 
 | |
| 
 | |
| [device "ich9-pci-bridge"]
 | |
| 	driver = "i82801b11-bridge"
 | |
| 	bus = "pcie.0"
 | |
| 	addr = "1e.0"
 |