event: add API for requiring an event loop impl to be registered

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7a791121e3fa66342b0b7651ad4c34a12b11e50d..c26ac9497de3e618e5564f88599f0043f5c1e92c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -240,6 +240,7 @@
 @SRCDIR@/src/util/virdnsmasq.c
 @SRCDIR@/src/util/virerror.c
 @SRCDIR@/src/util/virerror.h
+@SRCDIR@/src/util/virevent.c
 @SRCDIR@/src/util/vireventpoll.c
 @SRCDIR@/src/util/virfcp.c
 @SRCDIR@/src/util/virfdstream.c

diff --git a/src/util/virevent.c b/src/util/virevent.c
index 3cac9f9472950497cfad1825c49ca3a22006e343..f6c797724e2e7db5de707458e6172ae939145542 100644 (file)
--- a/src/util/virevent.c
+++ b/src/util/virevent.c
@@ -26,6 +26,7 @@
 #include "virlog.h"
 #include "virerror.h"
 
+#define VIR_FROM_THIS VIR_FROM_EVENT
 
 VIR_LOG_INIT("util.event");
 
@@ -251,6 +252,27 @@ void virEventRegisterImpl(virEventAddHandleFunc addHandle,
     removeTimeoutImpl = removeTimeout;
 }
 
+
+/**
+ * virEventRequireImpl:
+ *
+ * Require that there is an event loop implementation
+ * registered.
+ *
+ * Returns: -1 if no event loop is registered, 0 otherwise
+ */
+int virEventRequireImpl(void)
+{
+    if (!addHandleImpl || !addTimeoutImpl) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("An event loop implementation must be registered"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
 /**
  * virEventRegisterDefaultImpl:
  *
@@ -276,6 +298,8 @@ int virEventRegisterDefaultImpl(void)
 {
     VIR_DEBUG("registering default event implementation");
 
+    virInitialize();
+
     virResetLastError();
 
     if (virEventPollInit() < 0) {

diff --git a/src/util/virevent.h b/src/util/virevent.h
index 0b4f7d2b1b20b7ff67d93ce6974c831afb06c5a3..6c8fdcbac45db793add75360dfdaa8bfe7273316 100644 (file)
--- a/src/util/virevent.h
+++ b/src/util/virevent.h
@@ -21,3 +21,5 @@
 
 #pragma once
 #include "internal.h"
+
+int virEventRequireImpl(void);