From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
---
daemon/libvirtd.c | 1 -
daemon/libvirtd.h | 2 +-
src/Makefile.am | 8 ++++----
src/conf/device_conf.h | 2 +-
src/conf/domain_conf.h | 2 +-
src/conf/interface_conf.h | 2 +-
src/conf/network_conf.h | 2 +-
src/conf/node_device_conf.h | 2 +-
src/conf/storage_conf.h | 2 +-
src/conf/virconsole.c | 2 +-
src/datatypes.h | 2 +-
src/libvirt.c | 2 +-
src/locking/lock_daemon.h | 2 +-
src/lxc/lxc_conf.h | 2 +-
src/lxc/lxc_monitor.c | 2 +-
src/nwfilter/nwfilter_learnipaddr.c | 2 +-
src/openvz/openvz_conf.h | 2 +-
src/parallels/parallels_utils.h | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_domain.h | 2 +-
src/rpc/virkeepalive.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetclientprogram.c | 2 +-
src/rpc/virnetclientstream.c | 2 +-
src/rpc/virnetsaslcontext.c | 2 +-
src/rpc/virnetserver.c | 2 +-
src/rpc/virnetserverclient.c | 2 +-
src/rpc/virnetserverprogram.c | 2 +-
src/rpc/virnetserverservice.c | 2 +-
src/rpc/virnetsocket.c | 2 +-
src/rpc/virnetsshsession.c | 2 +-
src/rpc/virnettlscontext.c | 2 +-
src/secret/secret_driver.c | 2 +-
src/test/test_driver.c | 2 +-
src/uml/uml_conf.h | 2 +-
src/util/iohelper.c | 2 +-
src/util/util.c | 2 +-
src/util/virdbus.c | 2 +-
src/util/virebtables.c | 2 +-
src/util/vireventpoll.c | 2 +-
src/util/viriptables.c | 2 +-
src/util/virlockspace.c | 2 +-
src/util/virlog.c | 2 +-
src/util/virnetlink.c | 2 +-
src/util/virnodesuspend.c | 2 +-
src/util/virobject.c | 2 +-
src/util/virrandom.c | 2 +-
src/util/virterror.c | 2 +-
src/util/{threads.c => virthread.c} | 6 +++---
src/util/{threads.h => virthread.h} | 4 ++--
src/util/virthreadpool.c | 2 +-
src/util/{threads-pthread.c => virthreadpthread.c} | 0
src/util/{threads-pthread.h => virthreadpthread.h} | 0
src/util/{threads-win32.c => virthreadwin32.c} | 0
src/util/{threads-win32.h => virthreadwin32.h} | 0
src/vmware/vmware_conf.h | 2 +-
src/xen/xen_hypervisor.c | 2 +-
tests/eventtest.c | 2 +-
tests/nwfilterxml2xmltest.c | 2 +-
tests/qemumonitorjsontest.c | 2 +-
tests/qemumonitortestutils.c | 2 +-
tests/testutils.c | 2 +-
tests/viratomictest.c | 2 +-
tools/console.c | 2 +-
tools/virsh.c | 2 +-
tools/virsh.h | 2 +-
66 files changed, 67 insertions(+), 68 deletions(-)
rename src/util/{threads.c => virthread.c} (92%)
rename src/util/{threads.h => virthread.h} (98%)
rename src/util/{threads-pthread.c => virthreadpthread.c} (100%)
rename src/util/{threads-pthread.h => virthreadpthread.h} (100%)
rename src/util/{threads-win32.c => virthreadwin32.c} (100%)
rename src/util/{threads-win32.h => virthreadwin32.h} (100%)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 9f82c99..7b76c74 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -50,7 +50,6 @@
#include "virconf.h"
#include "virnetlink.h"
#include "virnetserver.h"
-#include "threads.h"
#include "remote.h"
#include "remote_driver.h"
#include "virhook.h"
diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h
index b04cc71..69a77ea 100644
--- a/daemon/libvirtd.h
+++ b/daemon/libvirtd.h
@@ -34,7 +34,7 @@
# include "remote_protocol.h"
# include "qemu_protocol.h"
# include "virlog.h"
-# include "threads.h"
+# include "virthread.h"
# if HAVE_SASL
# include "virnetsaslcontext.h"
# endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 188c9c8..8afcb31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,9 +53,6 @@ augeastest_DATA =
# These files are not related to driver APIs. Simply generic
# helper APIs for various purposes
UTIL_SOURCES = \
- util/threads.c util/threads.h \
- util/threads-pthread.h \
- util/threads-win32.h \
util/uuid.c util/uuid.h \
util/util.c util/util.h \
util/viralloc.c util/viralloc.h \
@@ -86,6 +83,9 @@ UTIL_SOURCES = \
util/virstatslinux.c util/virstatslinux.h \
util/virstoragefile.c util/virstoragefile.h \
util/virsysinfo.c util/virsysinfo.h \
+ util/virthread.c util/virthread.h \
+ util/virthreadpthread.h \
+ util/virthreadwin32.h \
util/virthreadpool.c util/virthreadpool.h \
util/virtypedparam.c util/virtypedparam.h \
util/xml.c util/xml.h \
@@ -126,7 +126,7 @@ $(srcdir)/util/virkeymaps.h: $(srcdir)/util/keymaps.csv \
$(srcdir)/util/virkeycode-mapgen.py
$(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py <$(srcdir)/util/keymaps.csv >$@
-EXTRA_DIST += util/threads-pthread.c util/threads-win32.c
+EXTRA_DIST += util/virthreadpthread.c util/virthreadwin32.c
# Internal generic driver infrastructure
NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index 09d6be9..c1bf096 100644
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -29,7 +29,7 @@
# include "internal.h"
# include "util.h"
-# include "threads.h"
+# include "virthread.h"
# include "virbuffer.h"
enum virDeviceAddressPciMulti {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e267b19..c7a19ae 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -33,7 +33,7 @@
# include "storage_encryption_conf.h"
# include "cpu_conf.h"
# include "util.h"
-# include "threads.h"
+# include "virthread.h"
# include "virhash.h"
# include "virsocketaddr.h"
# include "nwfilter_params.h"
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index 1749629..d6f98f1 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -30,7 +30,7 @@
# include "internal.h"
# include "util.h"
-# include "threads.h"
+# include "virthread.h"
/* There is currently 3 types of interfaces */
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 4d70fe6..4c634ed 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -31,7 +31,7 @@
# include <libxml/xpath.h>
# include "internal.h"
-# include "threads.h"
+# include "virthread.h"
# include "virsocketaddr.h"
# include "virnetdevbandwidth.h"
# include "virnetdevvportprofile.h"
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index e394042..9860f67 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -27,7 +27,7 @@
# include "internal.h"
# include "util.h"
-# include "threads.h"
+# include "virthread.h"
# include <libxml/tree.h>
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 743b768..573c3db 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -27,7 +27,7 @@
# include "internal.h"
# include "util.h"
# include "storage_encryption_conf.h"
-# include "threads.h"
+# include "virthread.h"
# include <libxml/tree.h>
diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c
index 757573d..515c5fa 100644
--- a/src/conf/virconsole.c
+++ b/src/conf/virconsole.c
@@ -31,7 +31,7 @@
#include "virhash.h"
#include "fdstream.h"
#include "internal.h"
-#include "threads.h"
+#include "virthread.h"
#include "viralloc.h"
#include "virpidfile.h"
#include "virlog.h"
diff --git a/src/datatypes.h b/src/datatypes.h
index 55f97ed..a1dfc1e 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -25,7 +25,7 @@
# include "internal.h"
# include "driver.h"
-# include "threads.h"
+# include "virthread.h"
# include "virobject.h"
extern virClassPtr virConnectClass;
diff --git a/src/libvirt.c b/src/libvirt.c
index ed7dcae..5654d53 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -59,7 +59,7 @@
#include "vircommand.h"
#include "virrandom.h"
#include "viruri.h"
-#include "threads.h"
+#include "virthread.h"
#ifdef WITH_TEST
# include "test/test_driver.h"
diff --git a/src/locking/lock_daemon.h b/src/locking/lock_daemon.h
index 619f8f2..da62edc 100644
--- a/src/locking/lock_daemon.h
+++ b/src/locking/lock_daemon.h
@@ -24,7 +24,7 @@
# define __VIR_LOCK_DAEMON_H__
# include "virlockspace.h"
-# include "threads.h"
+# include "virthread.h"
typedef struct _virLockDaemon virLockDaemon;
typedef virLockDaemon *virLockDaemonPtr;
diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index 70d47a4..d45e0a0 100644
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -31,7 +31,7 @@
# include "domain_conf.h"
# include "domain_event.h"
# include "capabilities.h"
-# include "threads.h"
+# include "virthread.h"
# include "vircgroup.h"
# include "security/security_manager.h"
# include "configmake.h"
diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 90637eb..b0da21f 100644
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -29,7 +29,7 @@
#include "virterror_internal.h"
#include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
#include "rpc/virnetclient.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 8c4bbcf..442cc83 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -47,7 +47,7 @@
#include "datatypes.h"
#include "virnetdev.h"
#include "virterror_internal.h"
-#include "threads.h"
+#include "virthread.h"
#include "conf/nwfilter_params.h"
#include "conf/domain_conf.h"
#include "nwfilter_gentech_driver.h"
diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h
index 3eb2b3e..c1007f0 100644
--- a/src/openvz/openvz_conf.h
+++ b/src/openvz/openvz_conf.h
@@ -31,7 +31,7 @@
# include "internal.h"
# include "domain_conf.h"
-# include "threads.h"
+# include "virthread.h"
/* OpenVZ commands - Replace with wrapper scripts later? */
diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h
index 7c31707..cf006e8 100644
--- a/src/parallels/parallels_utils.h
+++ b/src/parallels/parallels_utils.h
@@ -24,11 +24,11 @@
# define PARALLELS_UTILS_H
# include "driver.h"
-# include "util/threads.h"
# include "conf/domain_conf.h"
# include "conf/storage_conf.h"
# include "conf/domain_event.h"
# include "conf/network_conf.h"
+# include "virthread.h"
# include "virjson.h"
# define parallelsParseError() \
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 0d4816e..1aa56cc 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -32,7 +32,7 @@
# include "network_conf.h"
# include "domain_conf.h"
# include "domain_event.h"
-# include "threads.h"
+# include "virthread.h"
# include "security/security_manager.h"
# include "vircgroup.h"
# include "virpci.h"
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 11670b9..00648cf 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -24,7 +24,7 @@
#ifndef __QEMU_DOMAIN_H__
# define __QEMU_DOMAIN_H__
-# include "threads.h"
+# include "virthread.h"
# include "domain_conf.h"
# include "snapshot_conf.h"
# include "qemu_monitor.h"
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 91af315..5c14e14 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "virfile.h"
#include "virlog.h"
#include "util.h"
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index b4fe4d9..85787f0 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -31,7 +31,7 @@
#include "virnetsocket.h"
#include "virkeepalive.h"
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "virfile.h"
#include "virlog.h"
#include "util.h"
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 7396971..00948e0 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -33,7 +33,7 @@
#include "virlog.h"
#include "util.h"
#include "virfile.h"
-#include "threads.h"
+#include "virthread.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 4877b0c..7e1f9c7 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -27,7 +27,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index adc4f1e..cd30f4d 100644
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 26ceb0c..b48af5e 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -31,7 +31,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "virterror_internal.h"
-#include "threads.h"
+#include "virthread.h"
#include "virthreadpool.h"
#include "util.h"
#include "virfile.h"
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 7f028b8..f1eb69b 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -32,7 +32,7 @@
#include "virlog.h"
#include "virterror_internal.h"
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "virkeepalive.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index 287282e..a8f875c 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -30,7 +30,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "virfile.h"
-#include "threads.h"
+#include "virthread.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 92b5cef..9992983 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -27,7 +27,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
-#include "threads.h"
+#include "virthread.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 8c62a2a..442850a 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -46,7 +46,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "virfile.h"
-#include "threads.h"
+#include "virthread.h"
#include "virprocess.h"
#include "passfd.h"
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 8a7d5f9..663b7cd 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -30,7 +30,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "configmake.h"
-#include "threads.h"
+#include "virthread.h"
#include "util.h"
#include "virterror_internal.h"
#include "virobject.h"
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index d9354e0..1ff40cf 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -34,7 +34,7 @@
#include "virterror_internal.h"
#include "util.h"
#include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
#include "configmake.h"
#define DH_BITS 1024
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index fb2024b..672ff54 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -36,7 +36,7 @@
#include "viralloc.h"
#include "secret_conf.h"
#include "secret_driver.h"
-#include "threads.h"
+#include "virthread.h"
#include "util.h"
#include "uuid.h"
#include "virterror_internal.h"
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 0856cdb..c91e3cd 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -47,7 +47,7 @@
#include "storage_conf.h"
#include "node_device_conf.h"
#include "xml.h"
-#include "threads.h"
+#include "virthread.h"
#include "virlog.h"
#include "virfile.h"
#include "virtypedparam.h"
diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index 09a0305..dfa168e 100644
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -30,7 +30,7 @@
# include "domain_conf.h"
# include "domain_event.h"
# include "virterror_internal.h"
-# include "threads.h"
+# include "virthread.h"
# include "vircommand.h"
# include "virhash.h"
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 1b16d5c..dcb5c14 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include "util.h"
-#include "threads.h"
+#include "virthread.h"
#include "virfile.h"
#include "viralloc.h"
#include "virterror_internal.h"
diff --git a/src/util/util.c b/src/util/util.c
index 5d32995..c7d4aa5 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -81,7 +81,7 @@
#include "util.h"
#include "virstoragefile.h"
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "verify.h"
#include "virfile.h"
#include "vircommand.h"
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 34c46b2..f45074c 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -25,7 +25,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
#define VIR_FROM_THIS VIR_FROM_DBUS
diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index 1beb085..edf4956 100644
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -45,7 +45,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
#if HAVE_FIREWALLD
static char *firewall_cmd_path = NULL;
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index cf4dc41..1180fda 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <fcntl.h>
-#include "threads.h"
+#include "virthread.h"
#include "virlog.h"
#include "vireventpoll.h"
#include "viralloc.h"
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 178580d..eb8acf5 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -43,7 +43,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "threads.h"
+#include "virthread.h"
#if HAVE_FIREWALLD
static char *firewall_cmd_path = NULL;
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 509b162..961e171 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -28,7 +28,7 @@
#include "util.h"
#include "virfile.h"
#include "virhash.h"
-#include "threads.h"
+#include "virthread.h"
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/util/virlog.c b/src/util/virlog.c
index cb15a22..0c6c13a 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -45,7 +45,7 @@
#include "viralloc.h"
#include "util.h"
#include "virbuffer.h"
-#include "threads.h"
+#include "virthread.h"
#include "virfile.h"
#include "virtime.h"
#include "intprops.h"
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index b132d9a..fdd4c0d 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -38,7 +38,7 @@
#include "virnetlink.h"
#include "virlog.h"
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "virmacaddr.h"
#include "virterror_internal.h"
diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index 1528cf1..878be1d 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -23,7 +23,7 @@
#include "virnodesuspend.h"
#include "vircommand.h"
-#include "threads.h"
+#include "virthread.h"
#include "datatypes.h"
#include "viralloc.h"
diff --git a/src/util/virobject.c b/src/util/virobject.c
index 5cdd2e8..aca6182 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "virobject.h"
-#include "threads.h"
+#include "virthread.h"
#include "viralloc.h"
#include "viratomic.h"
#include "virterror_internal.h"
diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index c24bf3b..1dd96cf 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -27,7 +27,7 @@
#include <strings.h>
#include "virrandom.h"
-#include "threads.h"
+#include "virthread.h"
#include "count-one-bits.h"
#include "util.h"
#include "virterror_internal.h"
diff --git a/src/util/virterror.c b/src/util/virterror.c
index ce2d837..6c773d3 100644
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -31,7 +31,7 @@
#include "datatypes.h"
#include "virlog.h"
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "util.h"
virThreadLocal virLastErr;
diff --git a/src/util/threads.c b/src/util/virthread.c
similarity index 92%
rename from src/util/threads.c
rename to src/util/virthread.c
index d0d5b83..a062fd6 100644
--- a/src/util/threads.c
+++ b/src/util/virthread.c
@@ -21,14 +21,14 @@
#include <config.h>
-#include "threads.h"
+#include "virthread.h"
/* On mingw, we prefer native threading over the sometimes-broken
* pthreads-win32 library wrapper. */
#ifdef WIN32
-# include "threads-win32.c"
+# include "virthreadwin32.c"
#elif defined HAVE_PTHREAD_MUTEXATTR_INIT
-# include "threads-pthread.c"
+# include "virthreadpthread.c"
#else
# error "Either pthreads or Win32 threads are required"
#endif
diff --git a/src/util/threads.h b/src/util/virthread.h
similarity index 98%
rename from src/util/threads.h
rename to src/util/virthread.h
index 9761764..90aa5ce 100644
--- a/src/util/threads.h
+++ b/src/util/virthread.h
@@ -107,9 +107,9 @@ void *virThreadLocalGet(virThreadLocalPtr l);
int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK;
# ifdef WIN32
-# include "threads-win32.h"
+# include "virthreadwin32.h"
# elif defined HAVE_PTHREAD_MUTEXATTR_INIT
-# include "threads-pthread.h"
+# include "virthreadpthread.h"
# else
# error "Either pthreads or Win32 threads are required"
# endif
diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c
index c13b078..307cefb 100644
--- a/src/util/virthreadpool.c
+++ b/src/util/virthreadpool.c
@@ -27,7 +27,7 @@
#include "virthreadpool.h"
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/threads-pthread.c b/src/util/virthreadpthread.c
similarity index 100%
rename from src/util/threads-pthread.c
rename to src/util/virthreadpthread.c
diff --git a/src/util/threads-pthread.h b/src/util/virthreadpthread.h
similarity index 100%
rename from src/util/threads-pthread.h
rename to src/util/virthreadpthread.h
diff --git a/src/util/threads-win32.c b/src/util/virthreadwin32.c
similarity index 100%
rename from src/util/threads-win32.c
rename to src/util/virthreadwin32.c
diff --git a/src/util/threads-win32.h b/src/util/virthreadwin32.h
similarity index 100%
rename from src/util/threads-win32.h
rename to src/util/virthreadwin32.h
diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h
index b7a35a3..22d5240 100644
--- a/src/vmware/vmware_conf.h
+++ b/src/vmware/vmware_conf.h
@@ -25,7 +25,7 @@
# include "internal.h"
# include "domain_conf.h"
-# include "threads.h"
+# include "virthread.h"
# define VIR_FROM_THIS VIR_FROM_VMWARE
# define PROGRAM_SENTINAL ((char *)0x1)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index a692deb..22714a3 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -76,7 +76,7 @@
#include "virbuffer.h"
#include "capabilities.h"
#include "viralloc.h"
-#include "threads.h"
+#include "virthread.h"
#include "virfile.h"
#include "virnodesuspend.h"
#include "virtypedparam.h"
diff --git a/tests/eventtest.c b/tests/eventtest.c
index cd36a2d..6d00ea8 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -28,7 +28,7 @@
#include "testutils.h"
#include "internal.h"
-#include "threads.h"
+#include "virthread.h"
#include "virlog.h"
#include "util.h"
#include "vireventpoll.h"
diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 224ca93..8c29a46 100644
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -11,7 +11,7 @@
#include "internal.h"
#include "testutils.h"
#include "xml.h"
-#include "threads.h"
+#include "virthread.h"
#include "nwfilter_params.h"
#include "nwfilter_conf.h"
#include "testutilsqemu.h"
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 264c140..e1b6c56 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -22,7 +22,7 @@
#include "testutils.h"
#include "testutilsqemu.h"
#include "qemumonitortestutils.h"
-#include "threads.h"
+#include "virthread.h"
#include "virterror_internal.h"
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 1e3f0da..cc38803 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -26,7 +26,7 @@
#include "qemumonitortestutils.h"
-#include "threads.h"
+#include "virthread.h"
#include "qemu/qemu_monitor.h"
#include "rpc/virnetsocket.h"
#include "viralloc.h"
diff --git a/tests/testutils.c b/tests/testutils.c
index 7bb88f0..c6b1d23 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -41,7 +41,7 @@
#include "internal.h"
#include "viralloc.h"
#include "util.h"
-#include "threads.h"
+#include "virthread.h"
#include "virterror_internal.h"
#include "virbuffer.h"
#include "virlog.h"
diff --git a/tests/viratomictest.c b/tests/viratomictest.c
index 88f387b..1ed1707 100644
--- a/tests/viratomictest.c
+++ b/tests/viratomictest.c
@@ -26,7 +26,7 @@
#include "viratomic.h"
#include "virrandom.h"
-#include "threads.h"
+#include "virthread.h"
static int
testTypes(const void *data ATTRIBUTE_UNUSED)
diff --git a/tools/console.c b/tools/console.c
index 1d21189..d031308 100644
--- a/tools/console.c
+++ b/tools/console.c
@@ -42,7 +42,7 @@
# include "util.h"
# include "virfile.h"
# include "viralloc.h"
-# include "threads.h"
+# include "virthread.h"
# include "virterror_internal.h"
/*
diff --git a/tools/virsh.c b/tools/virsh.c
index e894aff..91a9677 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -64,7 +64,7 @@
#include "libvirt/libvirt-qemu.h"
#include "virfile.h"
#include "configmake.h"
-#include "threads.h"
+#include "virthread.h"
#include "vircommand.h"
#include "virkeycode.h"
#include "virnetdevbandwidth.h"
diff --git a/tools/virsh.h b/tools/virsh.h
index 6913ed1..6e6d3ee 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -35,7 +35,7 @@
# include "internal.h"
# include "virterror_internal.h"
-# include "threads.h"
+# include "virthread.h"
# include "virnetdevbandwidth.h"
# define VSH_MAX_XML_FILE (10*1024*1024)
--
1.7.11.7
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list