From 4d6050a8eb52feabde048fff9c717e159a739f24 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 12 Dec 2012 16:54:55 +0000
Subject: [PATCH] Rename event_poll.{c,h} to vireventpoll.{c,h}

---
 po/POTFILES.in                            | 2 +-
 src/Makefile.am                           | 2 +-
 src/rpc/virnetservermdns.c                | 2 +-
 src/util/virevent.c                       | 2 +-
 src/util/{event_poll.c => vireventpoll.c} | 4 ++--
 src/util/{event_poll.h => vireventpoll.h} | 2 +-
 tests/eventtest.c                         | 2 +-
 tools/virsh.c                             | 1 -
 8 files changed, 8 insertions(+), 9 deletions(-)
 rename src/util/{event_poll.c => vireventpoll.c} (99%)
 rename src/util/{event_poll.h => vireventpoll.h} (98%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6081c261bf..e1fcb1bb26 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -138,7 +138,6 @@ src/storage/storage_driver.c
 src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
-src/util/event_poll.c
 src/util/hooks.c
 src/util/hostusb.c
 src/util/iohelper.c
@@ -159,6 +158,7 @@ src/util/vircommand.c
 src/util/virconf.c
 src/util/virdbus.c
 src/util/virdnsmasq.c
+src/util/vireventpoll.c
 src/util/virfile.c
 src/util/virhash.c
 src/util/virinitctl.c
diff --git a/src/Makefile.am b/src/Makefile.am
index dadc7d09ec..0505d69737 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_poll.c util/event_poll.h		\
 		util/hooks.c util/hooks.h			\
 		util/iptables.c util/iptables.h			\
 		util/json.c util/json.h				\
@@ -84,6 +83,7 @@ UTIL_SOURCES =							\
 		util/virdnsmasq.c util/virdnsmasq.h             \
 		util/virebtables.c util/virebtables.h		\
 		util/virevent.c util/virevent.h			\
+		util/vireventpoll.c util/vireventpoll.h		\
 		util/virfile.c util/virfile.h			\
 		util/virnodesuspend.c util/virnodesuspend.h	\
 		util/virobject.c util/virobject.h		\
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index 0ddb9d8241..166b4eba21 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -41,7 +41,7 @@
 #endif
 
 #include "virnetservermdns.h"
-#include "event_poll.h"
+#include "vireventpoll.h"
 #include "memory.h"
 #include "virterror_internal.h"
 #include "logging.h"
diff --git a/src/util/virevent.c b/src/util/virevent.c
index 3b9504f993..736f183fc6 100644
--- a/src/util/virevent.c
+++ b/src/util/virevent.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "virevent.h"
-#include "event_poll.h"
+#include "vireventpoll.h"
 #include "logging.h"
 #include "virterror_internal.h"
 
diff --git a/src/util/event_poll.c b/src/util/vireventpoll.c
similarity index 99%
rename from src/util/event_poll.c
rename to src/util/vireventpoll.c
index 7a83a37079..287439f6a7 100644
--- a/src/util/event_poll.c
+++ b/src/util/vireventpoll.c
@@ -1,5 +1,5 @@
 /*
- * event.c: event loop for monitoring file handles
+ * vireventpoll.c: Poll based event loop for monitoring file handles
  *
  * Copyright (C) 2007, 2010-2012 Red Hat, Inc.
  * Copyright (C) 2007 Daniel P. Berrange
@@ -33,7 +33,7 @@
 
 #include "threads.h"
 #include "logging.h"
-#include "event_poll.h"
+#include "vireventpoll.h"
 #include "memory.h"
 #include "util.h"
 #include "virfile.h"
diff --git a/src/util/event_poll.h b/src/util/vireventpoll.h
similarity index 98%
rename from src/util/event_poll.h
rename to src/util/vireventpoll.h
index 64b2e965f4..c46ab807e0 100644
--- a/src/util/event_poll.h
+++ b/src/util/vireventpoll.h
@@ -1,5 +1,5 @@
 /*
- * event.h: event loop for monitoring file handles
+ * vireventpool.h: Poll based 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 c0879787bb..bc8d443085 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -31,7 +31,7 @@
 #include "threads.h"
 #include "logging.h"
 #include "util.h"
-#include "event_poll.h"
+#include "vireventpoll.h"
 
 #define NUM_FDS 31
 #define NUM_TIME 31
diff --git a/tools/virsh.c b/tools/virsh.c
index 07da077082..5cb2e063a1 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -63,7 +63,6 @@
 #include "xml.h"
 #include "libvirt/libvirt-qemu.h"
 #include "virfile.h"
-#include "event_poll.h"
 #include "configmake.h"
 #include "threads.h"
 #include "vircommand.h"
-- 
GitLab