Move QEMU driver lock helpers to a separate file

To allow their use from other source files, move qemuDriverLock
and qemuDriverUnlock to qemu_conf.h and make them non-static

* src/qemu/qemu_conf.c, src/qemu/qemu_conf.h: Add qemuDriverLock
  qemuDriverUnlock
* src/qemu/qemu_driver.c: Remove qemuDriverLock and qemuDriverUnlock

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 9869b4066ddf20952b2fa68fbd41f8b7f5f9c914..e1502dcde099b5c62fee6168a70e4be705895b1c 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -60,6 +60,16 @@
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
+void qemuDriverLock(struct qemud_driver *driver)
+{
+    virMutexLock(&driver->lock);
+}
+void qemuDriverUnlock(struct qemud_driver *driver)
+{
+    virMutexUnlock(&driver->lock);
+}
+
+
 int qemudLoadDriverConfig(struct qemud_driver *driver,
                           const char *filename) {
     virConfPtr conf;

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 4c61891bc3007bf76a3ffe805343c69f97b30fc6..83ddedda9bb17c2d68ff6f77a00dcf3c0a1c6c5a 100644 (file)
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -150,6 +150,8 @@ struct _qemuDomainCmdlineDef {
                          __FUNCTION__, __LINE__, __VA_ARGS__)
 
 
+void qemuDriverLock(struct qemud_driver *driver);
+void qemuDriverUnlock(struct qemud_driver *driver);
 int qemudLoadDriverConfig(struct qemud_driver *driver,
                           const char *filename);
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5d8aef3fcc7e46395bcd5be993cf132577c2cb01..9f2e53675076296d6f3beabb8238c1d63d1fedcd 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -109,15 +109,6 @@ static void processWatchdogEvent(void *data, void *opaque);
 
 static int qemudShutdown(void);
 
-static void qemuDriverLock(struct qemud_driver *driver)
-{
-    virMutexLock(&driver->lock);
-}
-static void qemuDriverUnlock(struct qemud_driver *driver)
-{
-    virMutexUnlock(&driver->lock);
-}
-
 static void qemuDomainEventFlush(int timer, void *opaque);
 static void qemuDomainEventQueue(struct qemud_driver *driver,
                                  virDomainEventPtr event);