From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 18 Mar 2016 17:03:52 +0000 (+0100)
Subject: hostdev: Use actual device when reattaching
X-Git-Tag: v1.3.3-rc1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee4cfb56436b50345b072c706b87aff82e06d760;p=thirdparty%2Flibvirt.git

hostdev: Use actual device when reattaching

Instead of forcing the values for the unbind_from_stub, remove_slot
and reprobe properties, look up the actual device and use that when
calling virPCIDeviceReattach().

This ensures the device is restored to its original state after
reattach: for example, if it was not bound to any driver before
detach, it will not be bound forcefully during reattach.
---

diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 933c94263c..b397b79175 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -1658,6 +1658,7 @@ virHostdevPCINodeDeviceReAttach(virHostdevManagerPtr mgr,
                                 virPCIDevicePtr pci)
 {
     struct virHostdevIsPCINodeDeviceUsedData data = { mgr, NULL, false };
+    virPCIDevicePtr actual;
     int ret = -1;
 
     virObjectLock(mgr->activePCIHostdevs);
@@ -1666,11 +1667,12 @@ virHostdevPCINodeDeviceReAttach(virHostdevManagerPtr mgr,
     if (virHostdevIsPCINodeDeviceUsed(virPCIDeviceGetAddress(pci), &data))
         goto cleanup;
 
-    virPCIDeviceSetUnbindFromStub(pci, true);
-    virPCIDeviceSetRemoveSlot(pci, true);
-    virPCIDeviceSetReprobe(pci, true);
+    /* We need to look up the actual device because that's what
+     * virPCIDeviceReattach() expects as its argument */
+    if (!(actual = virPCIDeviceListFind(mgr->inactivePCIHostdevs, pci)))
+        goto cleanup;
 
-    if (virPCIDeviceReattach(pci, mgr->activePCIHostdevs,
+    if (virPCIDeviceReattach(actual, mgr->activePCIHostdevs,
                              mgr->inactivePCIHostdevs) < 0)
         goto cleanup;