From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
src/Makefile.am | 2 +-
src/nwfilter/nwfilter_dhcpsnoop.c | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/rpc/virnetserver.c | 2 +-
src/util/{threadpool.c => virthreadpool.c} | 2 +-
src/util/{threadpool.h => virthreadpool.h} | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename src/util/{threadpool.c => virthreadpool.c} (99%)
rename src/util/{threadpool.h => virthreadpool.h} (100%)
diff --git a/src/Makefile.am b/src/Makefile.am
index e19a482..188c9c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,7 +56,6 @@ UTIL_SOURCES = \
util/threads.c util/threads.h \
util/threads-pthread.h \
util/threads-win32.h \
- util/threadpool.c util/threadpool.h \
util/uuid.c util/uuid.h \
util/util.c util/util.h \
util/viralloc.c util/viralloc.h \
@@ -87,6 +86,7 @@ UTIL_SOURCES = \
util/virstatslinux.c util/virstatslinux.h \
util/virstoragefile.c util/virstoragefile.h \
util/virsysinfo.c util/virsysinfo.h \
+ util/virthreadpool.c util/virthreadpool.h \
util/virtypedparam.c util/virtypedparam.h \
util/xml.c util/xml.h \
util/virterror.c util/virterror_internal.h \
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index a798e95..c1ab622 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -65,7 +65,7 @@
#include "virnetdev.h"
#include "virfile.h"
#include "viratomic.h"
-#include "threadpool.h"
+#include "virthreadpool.h"
#include "configmake.h"
#include "virtime.h"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index f928c29..0d4816e 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -41,7 +41,7 @@
# include "driver.h"
# include "virbitmap.h"
# include "vircommand.h"
-# include "threadpool.h"
+# include "virthreadpool.h"
# include "locking/lock_manager.h"
# include "qemu_capabilities.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7359e7b..a14cdb3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -84,7 +84,7 @@
#include "virfile.h"
#include "fdstream.h"
#include "configmake.h"
-#include "threadpool.h"
+#include "virthreadpool.h"
#include "locking/lock_manager.h"
#include "locking/domain_lock.h"
#include "virkeycode.h"
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 67cd4b5..26ceb0c 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -32,7 +32,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
#include "threads.h"
-#include "threadpool.h"
+#include "virthreadpool.h"
#include "util.h"
#include "virfile.h"
#include "virnetservermdns.h"
diff --git a/src/util/threadpool.c b/src/util/virthreadpool.c
similarity index 99%
rename from src/util/threadpool.c
rename to src/util/virthreadpool.c
index 9d3d5d2..c13b078 100644
--- a/src/util/threadpool.c
+++ b/src/util/virthreadpool.c
@@ -25,7 +25,7 @@
#include <config.h>
-#include "threadpool.h"
+#include "virthreadpool.h"
#include "viralloc.h"
#include "threads.h"
#include "virterror_internal.h"
diff --git a/src/util/threadpool.h b/src/util/virthreadpool.h
similarity index 100%
rename from src/util/threadpool.h
rename to src/util/virthreadpool.h
--
1.7.11.7