Rename event.{c,h} to virevent.{c,h}

Since the event APIs are now in the public header, no internal
code should include virevent.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 498fe2def4baa1ae4bce4371b364905af121a570..dadc7d09ec7021780b55fec1a6457cf3167347b0 100644 (file)
--- 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 4ed40ca3d3d44b1fff428e7486c12e0d3836f196..0e7e38e76a58b39588796b1dd728e1d069611964 100644 (file)
--- 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 6a5a53ac2586148825e1b23ba3c743249feb8c4f..f686a8ff4f9f70fe8ca45f9bc82cb3cfabec51bf 100644 (file)
--- 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 b55d4033c068dab55c5c62d7281ed0e7ad764aa8..0ddb9d824104354d222b3d6d8ee2d3d65ce67c02 100644 (file)
--- 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 70c621f636b9d194df164154356e5b2e8df6ed5c..5a2eab3c4c64b2650180a20305fe3b70fb8f3a62 100644 (file)
--- 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 98%
rename from src/util/event.c
rename to src/util/virevent.c
index 0abc30b689e9e25d2744a2e0205233008bd5b808..3b9504f9938842b72e97150033bdb55edcb38130 100644 (file)
--- a/src/util/event.c
+++ b/src/util/virevent.c
@@ -1,5 +1,5 @@
 /*
- * event.c: event loop for monitoring file handles
+ * virevent.c: event loop for monitoring file handles
  *
  * Copyright (C) 2007, 2011 Red Hat, Inc.
  * Copyright (C) 2007 Daniel P. Berrange
@@ -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 94%
rename from src/util/event.h
rename to src/util/virevent.h
index 5ab567adbeadaa58987d90623805531a2070ab28..d8b440bdedf5516796f2b8a7c163c9583dc59c6a 100644 (file)
--- a/src/util/event.h
+++ b/src/util/virevent.h
@@ -1,5 +1,5 @@
 /*
- * event.h: event loop for monitoring file handles
+ * virevent.h: event loop for monitoring file handles
  *
  * Copyright (C) 2007 Daniel P. Berrange
  * Copyright (C) 2007 Red Hat, Inc.

diff --git a/tests/eventtest.c b/tests/eventtest.c
index 78f51b7c4e54c250b101070479aae0a3ee52fefc..c0879787bbef3deb3d5a32352b05c53b1db29f53 100644 (file)
--- 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