[libvirt] [PATCH] qemu: don't assign a PCI address to 'none' USB controller
--- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9737609..126cced 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1925,6 +1925,11 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) continue; + /* USB controller model 'none' doesn't need a PCI address */ + if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) + continue; + /* FDC lives behind the ISA bridge; CCID is a usb device */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC || def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_CCID) -- 1.8.1.5
On 04/26/2013 11:04 AM, Ján Tomko wrote:
--- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9737609..126cced 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1925,6 +1925,11 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) continue;
+ /* USB controller model 'none' doesn't need a PCI address */ + if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) + continue;
ACK - something that isn't there can't use an address :) -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Fri, Apr 26, 2013 at 07:04:58PM +0200, Ján Tomko wrote:
--- src/qemu/qemu_command.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9737609..126cced 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1925,6 +1925,11 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) continue;
+ /* USB controller model 'none' doesn't need a PCI address */ + if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) + continue; + /* FDC lives behind the ISA bridge; CCID is a usb device */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC || def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_CCID)
I presume this is todo with the s390 problem ? If so, can you provide a test case with an s390 guest XML that exercises this problem + fix. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
Adjust the usb-none test, since it gives the membaloon a lower PCI slot now. Add a test for 'none' controller on s390, which doesn't have PCI buses. --- Diff to v1: Fixed the tests and added a new one. src/qemu/qemu_command.c | 5 ++++ .../qemuxml2argv-s390-usb-none.args | 11 ++++++++ .../qemuxml2argv-s390-usb-none.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 2 +- tests/qemuxml2argvtest.c | 5 ++++ 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6f6b61b..ce66650 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1917,6 +1917,11 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) continue; + /* USB controller model 'none' doesn't need a PCI address */ + if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) + continue; + /* FDC lives behind the ISA bridge; CCID is a usb device */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC || def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_CCID) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args new file mode 100644 index 0000000..753d84f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args @@ -0,0 +1,11 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu-system-s390x -S -M s390-virtio -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 \ +-device virtio-serial-s390,id=virtio-serial0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ +-chardev pty,id=charconsole0 \ +-device virtconsole,chardev=charconsole0,id=console0 \ +-object rng-random,id=rng0,filename=/dev/hwrng -device virtio-rng-s390,rng=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml new file mode 100644 index 0000000..f2977b5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>test</name> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <os> + <type arch='s390x' machine='s390-virtio'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='virtio'/> + <boot order='1'/> + </disk> + <console type='pty'> + <target type='virtio'/> + </console> + <controller type='usb' index='0' model='none'/> + <memballoon model='virtio'> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/hwrng</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args index 085b66f..09b66b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args @@ -2,4 +2,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /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-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7c4d1ce..88d786e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -955,6 +955,11 @@ mymain(void) QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("s390-usb-none", + QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("ppc-dtb", QEMU_CAPS_KVM, QEMU_CAPS_DTB); DO_TEST("tpm-passthrough", QEMU_CAPS_DEVICE, -- 1.8.1.5
n 04/26/2013 11:52 AM, Ján Tomko wrote:
Adjust the usb-none test, since it gives the membaloon a lower PCI slot now.
s/membaloon/memballoon/ (yes, it's a funky word to type with a doubled-double-letter, just ask any bookkeeper about it)
Add a test for 'none' controller on s390, which doesn't have PCI buses.
--- Diff to v1: Fixed the tests and added a new one.
ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 04/26/2013 08:00 PM, Eric Blake wrote:
n 04/26/2013 11:52 AM, Ján Tomko wrote:
Adjust the usb-none test, since it gives the membaloon a lower PCI slot now.
s/membaloon/memballoon/
(yes, it's a funky word to type with a doubled-double-letter, just ask any bookkeeper about it)
:)
Add a test for 'none' controller on s390, which doesn't have PCI buses.
--- Diff to v1: Fixed the tests and added a new one.
ACK.
Thank you, I've fixed the typo and pushed it. Jan
participants (3)
-
Daniel P. Berrange -
Eric Blake -
Ján Tomko