From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Mon, 5 Sep 2011 06:48:56 +0000 (+0800)
Subject: PIIX3 USB controller is on function 2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=07901bf2353837bf40b5f31fef0bd0669509c221;p=libvirt.git

PIIX3 USB controller is on function 2

Current code reserves slot 1 function 2 even if there is a user
defined PIIX3 USB controller there.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6ff1b2c756..e4bdb570fb 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;