mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 21:34:54 +03:00
5903378834
Instead of always using controller 0 and incrementing port number, respect the maximum port numbers of controllers and use all of them. Ports for virtio consoles are quietly reserved, but not formatted (neither in XML nor on QEMU command line). Also rejects duplicate virtio-serial addresses. https://bugzilla.redhat.com/show_bug.cgi?id=890606 https://bugzilla.redhat.com/show_bug.cgi?id=1076708 Test changes: * virtio-auto.args Filling out the port when just the controller is specified. switched from using maxport + 1 to: first free port on the controller * virtio-autoassign.args Filling out the address when no <address> is specified. Started using all the controllers instead of 0, also discards the bus value. * xml -> xml output of virtio-auto The port assignment is no longer done as a part of XML parsing, so the unspecified values stay 0.
21 lines
1.4 KiB
Plaintext
21 lines
1.4 KiB
Plaintext
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
|
|
/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \
|
|
-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
|
|
-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \
|
|
-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0\
|
|
,addr=0x3 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
|
|
-usb -hda /dev/HostVG/QEMUGuest1 \
|
|
-chardev pty,id=charchannel0 -device virtserialport,bus=virtio-serial0.0,nr=2,\
|
|
chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0 \
|
|
-chardev pty,id=charchannel1 -device virtserialport,bus=virtio-serial0.0,nr=3,\
|
|
chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo \
|
|
-chardev pty,id=charchannel2 -device virtserialport,bus=virtio-serial0.0,nr=1,\
|
|
chardev=charchannel2,id=channel2,name=org.linux-kvm.port.bar \
|
|
-chardev pty,id=charchannel3 -device virtserialport,bus=virtio-serial1.0,nr=1,\
|
|
chardev=charchannel3,id=channel3,name=org.linux-kvm.port.wizz \
|
|
-chardev pty,id=charchannel4 -device virtserialport,bus=virtio-serial1.0,nr=2,\
|
|
chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \
|
|
-chardev pty,id=charchannel5 -device virtserialport,bus=virtio-serial1.0,nr=3,\
|
|
chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla \
|
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
|