mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-17 07:07:16 +00:00
5266426b21
The nec-usb-xhci device (which is a USB3 controller) has always presented itself as a PCI device when plugged into a legacy PCI slot, and a PCIe device when plugged into a PCIe slot, but libvirt has always auto-assigned it to a legacy PCI slot. This patch changes that behavior to auto-assign to a PCIe slot on systems that have pcie-root (e.g. Q35 and aarch64/virt). Since we don't yet auto-create pcie-*-port controllers on demand, this means a config with an nec-xhci USB controller that has no PCI address assigned will also need to have an otherwise-unused pcie-*-port controller specified: <controller type='pci' model='pcie-root-port'/> <controller type='usb' model='nec-xhci'/> (this assumes there is an otherwise-unused slot on pcie-root to accept the pcie-root-port)
59 lines
2.6 KiB
Plaintext
59 lines
2.6 KiB
Plaintext
LC_ALL=C \
|
|
PATH=/bin \
|
|
HOME=/home/test \
|
|
USER=test \
|
|
LOGNAME=test \
|
|
QEMU_AUDIO_DRV=none \
|
|
/usr/libexec/qemu-kvm \
|
|
-name q35-test \
|
|
-S \
|
|
-M q35 \
|
|
-m 2048 \
|
|
-smp 2,sockets=2,cores=1,threads=1 \
|
|
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
|
|
-nographic \
|
|
-nodefaults \
|
|
-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \
|
|
-no-acpi \
|
|
-boot c \
|
|
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
|
|
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
|
|
-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
|
|
-device ioh3420,port=0x18,chassis=4,id=pci.4,bus=pcie.0,addr=0x3 \
|
|
-device ioh3420,port=0x20,chassis=5,id=pci.5,bus=pcie.0,addr=0x4 \
|
|
-device ioh3420,port=0x28,chassis=6,id=pci.6,bus=pcie.0,addr=0x5 \
|
|
-device ioh3420,port=0x30,chassis=7,id=pci.7,bus=pcie.0,addr=0x6 \
|
|
-device ioh3420,port=0x38,chassis=8,id=pci.8,bus=pcie.0,addr=0x7 \
|
|
-device ioh3420,port=0x40,chassis=9,id=pci.9,bus=pcie.0,addr=0x8 \
|
|
-device ioh3420,port=0x48,chassis=10,id=pci.10,bus=pcie.0,addr=0x9 \
|
|
-device ioh3420,port=0x50,chassis=11,id=pci.11,bus=pcie.0,addr=0xa \
|
|
-device ioh3420,port=0x58,chassis=12,id=pci.12,bus=pcie.0,addr=0xb \
|
|
-device ioh3420,port=0x60,chassis=13,id=pci.13,bus=pcie.0,addr=0xc \
|
|
-device ioh3420,port=0x68,chassis=14,id=pci.14,bus=pcie.0,addr=0xd \
|
|
-device ioh3420,port=0x70,chassis=15,id=pci.15,bus=pcie.0,addr=0xe \
|
|
-device nec-usb-xhci,id=usb,bus=pci.8,addr=0x0 \
|
|
-device virtio-scsi-pci,id=scsi0,bus=pci.7,addr=0x0 \
|
|
-device virtio-serial-pci,id=virtio-serial0,bus=pci.6,addr=0x0 \
|
|
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk1 \
|
|
-device virtio-blk-pci,bus=pci.9,addr=0x0,drive=drive-virtio-disk1,\
|
|
id=virtio-disk1 \
|
|
-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
|
|
-device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\
|
|
bus=pci.3,addr=0x0 \
|
|
-netdev user,id=hostnet0 \
|
|
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.4,\
|
|
addr=0x0 \
|
|
-netdev user,id=hostnet1 \
|
|
-device e1000e,netdev=hostnet1,id=net1,mac=00:11:22:33:44:66,bus=pci.5,\
|
|
addr=0x0 \
|
|
-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.12,\
|
|
addr=0x0 \
|
|
-device virtio-mouse-pci,id=input1,bus=pci.13,addr=0x0 \
|
|
-device virtio-keyboard-pci,id=input2,bus=pci.14,addr=0x0 \
|
|
-device virtio-tablet-pci,id=input3,bus=pci.15,addr=0x0 \
|
|
-device virtio-gpu-pci,id=video0,bus=pcie.0,addr=0x1 \
|
|
-device virtio-balloon-pci,id=balloon0,bus=pci.10,addr=0x0 \
|
|
-object rng-random,id=objrng0,filename=/dev/urandom \
|
|
-device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,\
|
|
bus=pci.11,addr=0x0
|