[libvirt] [PATCH v2 08/28] Rename event.{c,h} to virevent.{c,h}

[Daniel P. Berrange]

From: "Daniel P. Berrange" <berrange at redhat.com>

Since the event APIs are now in the public header, no internal
code should include virevent.h
---
 src/Makefile.am                  | 2 +-
 src/rpc/virnetclientstream.c     | 1 -
 src/rpc/virnetserver.c           | 1 -
 src/rpc/virnetservermdns.c       | 1 -
 src/rpc/virnetsocket.c           | 1 -
 src/util/{event.c => virevent.c} | 2 +-
 src/util/{event.h => virevent.h} | 0
 tests/eventtest.c                | 1 -
 8 files changed, 2 insertions(+), 7 deletions(-)
 rename src/util/{event.c => virevent.c} (99%)
 rename src/util/{event.h => virevent.h} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 498fe2d..dadc7d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =							\
-		util/event.c util/event.h			\
 		util/event_poll.c util/event_poll.h		\
 		util/hooks.c util/hooks.h			\
 		util/iptables.c util/iptables.h			\
@@ -84,6 +83,7 @@ UTIL_SOURCES =							\
 		util/virconf.c util/virconf.h			\
 		util/virdnsmasq.c util/virdnsmasq.h             \
 		util/virebtables.c util/virebtables.h		\
+		util/virevent.c util/virevent.h			\
 		util/virfile.c util/virfile.h			\
 		util/virnodesuspend.c util/virnodesuspend.h	\
 		util/virobject.c util/virobject.h		\
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 4ed40ca..0e7e38e 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -27,7 +27,6 @@
 #include "memory.h"
 #include "virterror_internal.h"
 #include "logging.h"
-#include "event.h"
 #include "threads.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 6a5a53a..f686a8f 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -35,7 +35,6 @@
 #include "threadpool.h"
 #include "util.h"
 #include "virfile.h"
-#include "event.h"
 #include "virnetservermdns.h"
 #include "virdbus.h"
 
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index b55d403..0ddb9d8 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -41,7 +41,6 @@
 #endif
 
 #include "virnetservermdns.h"
-#include "event.h"
 #include "event_poll.h"
 #include "memory.h"
 #include "virterror_internal.h"
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 70c621f..5a2eab3 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -46,7 +46,6 @@
 #include "virterror_internal.h"
 #include "logging.h"
 #include "virfile.h"
-#include "event.h"
 #include "threads.h"
 #include "virprocess.h"
 
diff --git a/src/util/event.c b/src/util/virevent.c
similarity index 99%
rename from src/util/event.c
rename to src/util/virevent.c
index 0abc30b..08b7006 100644
--- a/src/util/event.c
+++ b/src/util/virevent.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "event.h"
+#include "virevent.h"
 #include "event_poll.h"
 #include "logging.h"
 #include "virterror_internal.h"
diff --git a/src/util/event.h b/src/util/virevent.h
similarity index 100%
rename from src/util/event.h
rename to src/util/virevent.h
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 78f51b7..c087978 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -31,7 +31,6 @@
 #include "threads.h"
 #include "logging.h"
 #include "util.h"
-#include "event.h"
 #include "event_poll.h"
 
 #define NUM_FDS 31
-- 
1.7.11.7