[libvirt] [PATCH] qemu: don't assign a PCI address to 'none' USB controller

[Daniel P. Berrange]

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 :|