From: Chunyan Liu <cyliu@suse.com>
Date: Wed, 5 Mar 2014 11:55:45 +0000 (+0800)
Subject: pass driver name as a parameter to virHostdevReAttachPCIDevices
X-Git-Tag: v1.2.3-rc1~272
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e46107e438654a913815206d658e15c6192ef4d;p=thirdparty%2Flibvirt.git

pass driver name as a parameter to virHostdevReAttachPCIDevices
---

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index e5785196bc..5fa6eb4db2 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -1288,6 +1288,7 @@ qemuReattachPciDevice(virPCIDevicePtr dev, virHostdevManagerPtr mgr)
  */
 static void
 virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
+                             const char *drv_name,
                              const char *name,
                              virDomainHostdevDefPtr *hostdevs,
                              int nhostdevs,
@@ -1326,7 +1327,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
             const char *usedby_drvname;
             const char *usedby_domname;
             virPCIDeviceGetUsedBy(activeDev, &usedby_drvname, &usedby_domname);
-            if (STRNEQ_NULLABLE(QEMU_DRIVER_NAME, usedby_drvname) ||
+            if (STRNEQ_NULLABLE(drv_name, usedby_drvname) ||
                 STRNEQ_NULLABLE(name, usedby_domname)) {
                     virPCIDeviceListDel(pcidevs, dev);
                     continue;
@@ -1381,7 +1382,7 @@ qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver,
     char *oldStateDir = cfg->stateDir;
     virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
 
-    virHostdevReAttachPCIDevices(hostdev_mgr, name,
+    virHostdevReAttachPCIDevices(hostdev_mgr, QEMU_DRIVER_NAME, name,
                                  hostdevs, nhostdevs, oldStateDir);
 
     virObjectUnref(cfg);