From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
---
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} | 2 +-
src/util/{event_poll.h => vireventpoll.h} | 0
tests/eventtest.c | 2 +-
tools/virsh.c | 1 -
8 files changed, 6 insertions(+), 7 deletions(-)
rename src/util/{event_poll.c => vireventpoll.c} (99%)
rename src/util/{event_poll.h => vireventpoll.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6081c26..e1fcb1b 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 dadc7d0..0505d69 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 0ddb9d8..166b4eb 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 08b7006..7d11f85 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 7a83a37..9fd196d 100644
--- a/src/util/event_poll.c
+++ b/src/util/vireventpoll.c
@@ -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 100%
rename from src/util/event_poll.h
rename to src/util/vireventpoll.h
diff --git a/tests/eventtest.c b/tests/eventtest.c
index c087978..bc8d443 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 07da077..5cb2e06 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"
--
1.7.11.7
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list