[PATCH 23/24] hostdev: Use actual device when reattaching

[Andrea Bolognani <abologna@xxxxxxxxxx>]

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.
---
 src/util/virhostdev.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index b2f54cd..86a0331 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -1613,6 +1613,7 @@ virHostdevPCINodeDeviceReAttach(virHostdevManagerPtr mgr,
                                 virPCIDevicePtr pci)
 {
     struct virHostdevIsPCINodeDeviceUsedData data = { mgr, NULL, false };
+    virPCIDevicePtr actual;
     int ret = -1;
 
     virObjectLock(mgr->activePCIHostdevs);
@@ -1621,11 +1622,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;
 
-- 
2.5.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list