[libvirt] [PATCH 1/3] PIIX3 USB controller is on function 2

[Daniel Veillard]

On Fri, Sep 02, 2011 at 07:43:31PM +0200, Marc-André Lureau wrote:
> Current code reserves slot 1 function 2 even if there is a user
> defined PIIX3 USB controller there.
> ---
>  src/qemu/qemu_command.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 6ff1b2c..e4bdb57 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -1181,7 +1181,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs)
>       * hardcoded slot=1, multifunction device
>       */
>      for (function = 0; function < QEMU_PCI_ADDRESS_LAST_FUNCTION; function++) {
> -        if (function == 1 && (reservedIDE || reservedUSB))
> +        if ((function == 1 && reservedIDE) ||
> +            (function == 2 && reservedUSB))
>              /* we have reserved this pci address */
>              continue;

  Yeah, I had to manually tweak that part on the rebase and of course
got it wrong ! Thanks for the quick fix :-)

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/