From: Jim Fehlig <jfehlig@suse.com>
Date: Fri, 30 Aug 2013 20:56:40 +0000 (-0600)
Subject: libxl: Move driver lock/unlock to libxl_conf
X-Git-Tag: CVE-2013-4297~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf735fe03c9203f7a548fd3977a61c34324dcc47;p=thirdparty%2Flibvirt.git

libxl: Move driver lock/unlock to libxl_conf

Move the libxl driver lock/unlock functions from libxl_driver.c
to libxl_conf.h so they can be used by other source files.
---

diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 95e09832c4..174a759534 100644
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -150,4 +150,16 @@ int
 libxlBuildDomainConfig(libxlDriverPrivatePtr driver,
                        virDomainObjPtr vm, libxl_domain_config *d_config);
 
+static inline void
+libxlDriverLock(libxlDriverPrivatePtr driver)
+{
+    virMutexLock(&driver->lock);
+}
+
+static inline void
+libxlDriverUnlock(libxlDriverPrivatePtr driver)
+{
+    virMutexUnlock(&driver->lock);
+}
+
 #endif /* LIBXL_CONF_H */
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 12d5ddc7c2..d5db8bbee5 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -77,18 +77,6 @@ static int
 libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm,
              bool start_paused, int restore_fd);
 
-static void
-libxlDriverLock(libxlDriverPrivatePtr driver)
-{
-    virMutexLock(&driver->lock);
-}
-
-static void
-libxlDriverUnlock(libxlDriverPrivatePtr driver)
-{
-    virMutexUnlock(&driver->lock);
-}
-
 /* driver must be locked before calling */
 static void
 libxlDomainEventQueue(libxlDriverPrivatePtr driver, virDomainEventPtr event)