From: Chunyan Liu <cyliu@suse.com>
Date: Thu, 6 Mar 2014 04:32:42 +0000 (+0800)
Subject: extract general code from qemuUpdateActivePciHostdevs
X-Git-Tag: v1.2.3-rc1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94d505ba1536aaaa2694b08bb31258af1dad3906;p=thirdparty%2Flibvirt.git

extract general code from qemuUpdateActivePciHostdevs

Extract general code from qemuUpdateActivePciHostdevs to
virHostdevUpdateActivePciHostdevs.
---

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 9fe4019a92..b52f7acd04 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -41,18 +41,14 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
-int
-qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
-                            virDomainDefPtr def)
+static int
+virHostdevUpdateActivePciHostdevs(virHostdevManagerPtr mgr,
+                                  virDomainDefPtr def)
 {
     virDomainHostdevDefPtr hostdev = NULL;
     virPCIDevicePtr dev = NULL;
     size_t i;
     int ret = -1;
-    virHostdevManagerPtr mgr = driver->hostdevMgr;
-
-    if (!def->nhostdevs)
-        return 0;
 
     virObjectLock(mgr->activePciHostdevs);
     virObjectLock(mgr->inactivePciHostdevs);
@@ -103,6 +99,18 @@ cleanup:
     return ret;
 }
 
+int
+qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
+                            virDomainDefPtr def)
+{
+    virHostdevManagerPtr mgr = driver->hostdevMgr;
+
+    if (!def->nhostdevs)
+        return 0;
+
+    return virHostdevUpdateActivePciHostdevs(mgr, def);
+}
+
 int
 qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver,
                             virDomainDefPtr def)