]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Do not wait if the PCI device is not managed when reattaching
authorOsier Yang <jyang@redhat.com>
Mon, 17 Oct 2011 10:19:58 +0000 (18:19 +0800)
committerOsier Yang <jyang@redhat.com>
Tue, 18 Oct 2011 00:27:02 +0000 (08:27 +0800)
Waiting for qemu-kvm cleaning up the PCI bar(s) mapping with long time
while the device is not managed is just waste of time.

src/qemu/qemu_hostdev.c

index c65f6f5417a4d507015c906fa21dc854b05dd10a..1fb373e220d10d58e6b3ed8287fb73e58d5da0ec 100644 (file)
@@ -322,19 +322,20 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver)
 {
     int retries = 100;
 
+    if (!pciDeviceGetManaged(dev))
+        return;
+
     while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device")
            && retries) {
         usleep(100*1000);
         retries--;
     }
 
-    if (pciDeviceGetManaged(dev)) {
-        if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) {
-            virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to re-attach PCI device: %s"),
-                      err ? err->message : _("unknown error"));
-            virResetError(err);
-        }
+    if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) {
+        virErrorPtr err = virGetLastError();
+        VIR_ERROR(_("Failed to re-attach PCI device: %s"),
+                  err ? err->message : _("unknown error"));
+        virResetError(err);
     }
 }