5:55 a.m.
Currently the files in src/util are 50/50 split between those
having a 'vir' prefix and those which don't. Finish the job
by remaining all remaining files to have a 'vir' prefix too,
guaranteeing that they can't clash with system headers[1].
The only case which was not a plain rename, was merging
processinfo.{c,h} into the virprocess.{c,h} since the
functionality logically belongs together.
At the end src/Makefile.am is updated to sort util files
alphabetically.
Left as further work - make sure all functions in these
files also have a 'vir' prefix. eg dnsmasq, ebtables,
iptables, usb and pci files are violators in this regard.
Also left, much of virutil.c should move into virfile.c
Changes in v2:
- Rebased to latest GIT
- Turned on rename detection to make review easier
Daniel
[1] Not a theoretical problem - we already hit a clsah
on 'usb.h' before forcing us to use 'hostusb.h'
and 'memory.h' clashes with a system header but we
never noticed so far.
In-Reply-To:
5:55 a.m.
New subject: [libvirt] [PATCH v2 01/28] Rename cgroup.{h,c} to vircgroup.{h,c}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
To bring in line with new naming practice, rename the=
src/util/cgroup.{h,c} files to vircgroup.{h,c}
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/conf/domain_audit.h | 2 +-
src/lxc/lxc_cgroup.c | 2 +-
src/lxc/lxc_conf.h | 2 +-
src/qemu/qemu_cgroup.c | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/util/{cgroup.c => vircgroup.c} | 4 ++--
src/util/{cgroup.h => vircgroup.h} | 8 ++++----
9 files changed, 13 insertions(+), 13 deletions(-)
rename src/util/{cgroup.c => vircgroup.c} (99%)
rename src/util/{cgroup.h => vircgroup.h} (97%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b08cf0..c5f68e4 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/cgroup.c
src/util/command.c
src/util/conf.c
src/util/dnsmasq.c
@@ -158,6 +157,7 @@ src/util/util.c
src/util/viraudit.c
src/util/virauth.c
src/util/virauthconfig.c
+src/util/vircgroup.c
src/util/virdbus.c
src/util/virfile.c
src/util/virhash.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 52805e8..e87b0c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,6 @@ UTIL_SOURCES = \
util/buf.c util/buf.h \
util/command.c util/command.h \
util/conf.c util/conf.h \
- util/cgroup.c util/cgroup.h \
util/event.c util/event.h \
util/event_poll.c util/event_poll.h \
util/hooks.c util/hooks.h \
@@ -93,6 +92,7 @@ UTIL_SOURCES = \
util/virtypedparam.c util/virtypedparam.h \
util/xml.c util/xml.h \
util/virterror.c util/virterror_internal.h \
+ util/vircgroup.c util/vircgroup.h \
util/virdbus.c util/virdbus.h \
util/virhash.c util/virhash.h \
util/virhashcode.c util/virhashcode.h \
diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h
index 63a8f75..381fe37 100644
--- a/src/conf/domain_audit.h
+++ b/src/conf/domain_audit.h
@@ -25,7 +25,7 @@
# define __VIR_DOMAIN_AUDIT_H__
# include "domain_conf.h"
-# include "cgroup.h"
+# include "vircgroup.h"
void virDomainAuditStart(virDomainObjPtr vm,
const char *reason,
diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 4fe23c1..5f092de 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "logging.h"
#include "memory.h"
-#include "cgroup.h"
+#include "vircgroup.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index d66f284..a9c337e 100644
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -32,7 +32,7 @@
# include "domain_event.h"
# include "capabilities.h"
# include "threads.h"
-# include "cgroup.h"
+# include "vircgroup.h"
# include "security/security_manager.h"
# include "configmake.h"
# include "hostusb.h"
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 084d89d..445d085 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -26,7 +26,7 @@
#include "qemu_cgroup.h"
#include "qemu_domain.h"
#include "qemu_process.h"
-#include "cgroup.h"
+#include "vircgroup.h"
#include "logging.h"
#include "memory.h"
#include "virterror_internal.h"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 1a39946..cfa6fff 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -34,7 +34,7 @@
# include "domain_event.h"
# include "threads.h"
# include "security/security_manager.h"
-# include "cgroup.h"
+# include "vircgroup.h"
# include "pci.h"
# include "hostusb.h"
# include "cpu_conf.h"
diff --git a/src/util/cgroup.c b/src/util/vircgroup.c
similarity index 99%
rename from src/util/cgroup.c
rename to src/util/vircgroup.c
index 8f3b8b7..e9fc67f 100644
--- a/src/util/cgroup.c
+++ b/src/util/vircgroup.c
@@ -1,5 +1,5 @@
/*
- * cgroup.c: Tools for managing cgroups
+ * vircgroup.c: methods for managing control cgroups
*
* Copyright (C) 2010-2012 Red Hat, Inc.
* Copyright IBM Corp. 2008
@@ -40,7 +40,7 @@
#include "internal.h"
#include "util.h"
#include "memory.h"
-#include "cgroup.h"
+#include "vircgroup.h"
#include "logging.h"
#include "virfile.h"
#include "virhash.h"
diff --git a/src/util/cgroup.h b/src/util/vircgroup.h
similarity index 97%
rename from src/util/cgroup.h
rename to src/util/vircgroup.h
index fc9e409..8b6d3b2 100644
--- a/src/util/cgroup.h
+++ b/src/util/vircgroup.h
@@ -1,5 +1,5 @@
/*
- * cgroup.h: Interface to tools for managing cgroups
+ * vircgroup.h: methods for managing control cgroups
*
* Copyright (C) 2011-2012 Red Hat, Inc.
* Copyright IBM Corp. 2008
@@ -22,8 +22,8 @@
* Dan Smith <danms(a)us.ibm.com>
*/
-#ifndef CGROUP_H
-# define CGROUP_H
+#ifndef __VIR_CGROUP_H__
+# define __VIR_CGROUP_H__
struct virCgroup;
typedef struct virCgroup *virCgroupPtr;
@@ -164,4 +164,4 @@ int virCgroupKill(virCgroupPtr group, int signum);
int virCgroupKillRecursive(virCgroupPtr group, int signum);
int virCgroupKillPainfully(virCgroupPtr group);
-#endif /* CGROUP_H */
+#endif /* __VIR_CGROUP_H__ */
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 02/28] Rename bitmap.{c,h} to virbitmap.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/Makefile.am | 2 +-
src/conf/cpu_conf.h | 2 +-
src/conf/domain_conf.c | 3 +--
src/conf/domain_conf.h | 2 +-
src/conf/network_conf.h | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/libxl/libxl_conf.h | 2 +-
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_monitor.h | 2 +-
src/qemu/qemu_monitor_json.h | 2 +-
src/qemu/qemu_process.c | 2 +-
src/util/dnsmasq.c | 2 +-
src/util/processinfo.h | 2 +-
src/util/{bitmap.c => virbitmap.c} | 2 +-
src/util/{bitmap.h => virbitmap.h} | 0
tests/virbitmaptest.c | 2 +-
tools/virsh-domain.c | 2 +-
tools/virsh.c | 2 +-
20 files changed, 19 insertions(+), 20 deletions(-)
rename src/util/{bitmap.c => virbitmap.c} (99%)
rename src/util/{bitmap.h => virbitmap.h} (100%)
diff --git a/src/Makefile.am b/src/Makefile.am
index e87b0c8..a6cab58 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/bitmap.c util/bitmap.h \
util/buf.c util/buf.h \
util/command.c util/command.h \
util/conf.c util/conf.h \
@@ -84,6 +83,7 @@ UTIL_SOURCES = \
util/viraudit.c util/viraudit.h \
util/virauth.c util/virauth.h \
util/virauthconfig.c util/virauthconfig.h \
+ util/virbitmap.c util/virbitmap.h \
util/virfile.c util/virfile.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virobject.c util/virobject.h \
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 5bff70e..bd6dfd9 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -27,7 +27,7 @@
# include "util.h"
# include "buf.h"
# include "xml.h"
-# include "bitmap.h"
+# include "virbitmap.h"
# include "virarch.h"
# define VIR_CPU_VENDOR_ID_LENGTH 12
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ccb3b63..ff6d979 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -44,14 +44,13 @@
#include "nwfilter_conf.h"
#include "storage_file.h"
#include "virfile.h"
-#include "bitmap.h"
+#include "virbitmap.h"
#include "count-one-bits.h"
#include "secret_conf.h"
#include "netdev_vport_profile_conf.h"
#include "netdev_bandwidth_conf.h"
#include "netdev_vlan_conf.h"
#include "device_conf.h"
-#include "bitmap.h"
#define VIR_FROM_THIS VIR_FROM_DOMAIN
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index af2b01c..01b76ec 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -46,7 +46,7 @@
# include "virnetdevvlan.h"
# include "virobject.h"
# include "device_conf.h"
-# include "bitmap.h"
+# include "virbitmap.h"
# include "storage_file.h"
/* forward declarations of all device types, required by
diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h
index 72cf64b..4d70fe6 100644
--- a/src/conf/network_conf.h
+++ b/src/conf/network_conf.h
@@ -38,7 +38,7 @@
# include "virnetdevvlan.h"
# include "virmacaddr.h"
# include "device_conf.h"
-# include "bitmap.h"
+# include "virbitmap.h"
enum virNetworkForwardType {
VIR_NETWORK_FORWARD_NONE = 0,
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index bba1bb7..95b7943 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -29,7 +29,7 @@
#include <unistd.h>
#include "internal.h"
-#include "bitmap.h"
+#include "virbitmap.h"
#include "buf.h"
#include "count-one-bits.h"
#include "datatypes.h"
diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h
index 6bcf805..c8808a1 100644
--- a/src/libxl/libxl_conf.h
+++ b/src/libxl/libxl_conf.h
@@ -34,7 +34,7 @@
# include "domain_event.h"
# include "capabilities.h"
# include "configmake.h"
-# include "bitmap.h"
+# include "virbitmap.h"
# define LIBXL_VNC_PORT_MIN 5900
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 50d999a..f07f6bb 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -35,7 +35,7 @@
#include "cpu/cpu.h"
#include "domain_conf.h"
#include "command.h"
-#include "bitmap.h"
+#include "virbitmap.h"
#include "virnodesuspend.h"
#include "qemu_monitor.h"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index cfa6fff..bcf21c3 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -39,7 +39,7 @@
# include "hostusb.h"
# include "cpu_conf.h"
# include "driver.h"
-# include "bitmap.h"
+# include "virbitmap.h"
# include "command.h"
# include "threadpool.h"
# include "locking/lock_manager.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7d8dd21..7e8a1d8 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -91,7 +91,7 @@
#include "virnodesuspend.h"
#include "virtime.h"
#include "virtypedparam.h"
-#include "bitmap.h"
+#include "virbitmap.h"
#define VIR_FROM_THIS VIR_FROM_QEMU
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index dbfab88..8c42b12 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -28,7 +28,7 @@
# include "internal.h"
# include "domain_conf.h"
-# include "bitmap.h"
+# include "virbitmap.h"
# include "virhash.h"
# include "json.h"
# include "device_conf.h"
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index acca4ec..2b09a8f 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -28,7 +28,7 @@
# include "internal.h"
# include "qemu_monitor.h"
-# include "bitmap.h"
+# include "virbitmap.h"
int qemuMonitorJSONIOProcess(qemuMonitorPtr mon,
const char *data,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 89796af..030e000 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -69,7 +69,7 @@
#include "virprocess.h"
#include "virtime.h"
#include "virnetdevtap.h"
-#include "bitmap.h"
+#include "virbitmap.h"
#define VIR_FROM_THIS VIR_FROM_QEMU
diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c
index 8d714dc..dfd6034 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -39,7 +39,7 @@
#include "internal.h"
#include "datatypes.h"
-#include "bitmap.h"
+#include "virbitmap.h"
#include "dnsmasq.h"
#include "util.h"
#include "command.h"
diff --git a/src/util/processinfo.h b/src/util/processinfo.h
index 116c092..0ae23c6 100644
--- a/src/util/processinfo.h
+++ b/src/util/processinfo.h
@@ -23,7 +23,7 @@
# define __VIR_PROCESSINFO_H__
# include "internal.h"
-# include "bitmap.h"
+# include "virbitmap.h"
int virProcessInfoSetAffinity(pid_t pid, virBitmapPtr map);
diff --git a/src/util/bitmap.c b/src/util/virbitmap.c
similarity index 99%
rename from src/util/bitmap.c
rename to src/util/virbitmap.c
index c29f5f3..0f13389 100644
--- a/src/util/bitmap.c
+++ b/src/util/virbitmap.c
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <sys/types.h>
-#include "bitmap.h"
+#include "virbitmap.h"
#include "memory.h"
#include "buf.h"
#include "util.h"
diff --git a/src/util/bitmap.h b/src/util/virbitmap.h
similarity index 100%
rename from src/util/bitmap.h
rename to src/util/virbitmap.h
diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c
index af94dab..db76672 100644
--- a/tests/virbitmaptest.c
+++ b/tests/virbitmaptest.c
@@ -21,7 +21,7 @@
#include "testutils.h"
-#include "bitmap.h"
+#include "virbitmap.h"
static int test1(const void *data ATTRIBUTE_UNUSED)
{
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 561e0e7..765f30c 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -37,7 +37,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "bitmap.h"
+#include "virbitmap.h"
#include "buf.h"
#include "c-ctype.h"
#include "conf/domain_conf.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 465cb44..2f7d4a3 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -69,7 +69,7 @@
#include "command.h"
#include "virkeycode.h"
#include "virnetdevbandwidth.h"
-#include "util/bitmap.h"
+#include "virbitmap.h"
#include "conf/domain_conf.h"
#include "virtypedparam.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 03/28] Rename buf.{c,h} to virbuffer.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/Makefile.am | 2 +-
src/conf/capabilities.c | 2 +-
src/conf/capabilities.h | 2 +-
src/conf/cpu_conf.c | 2 +-
src/conf/cpu_conf.h | 2 +-
src/conf/device_conf.c | 2 +-
src/conf/device_conf.h | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/interface_conf.c | 2 +-
src/conf/netdev_bandwidth_conf.h | 2 +-
src/conf/netdev_vlan_conf.h | 2 +-
src/conf/netdev_vport_profile_conf.h | 2 +-
src/conf/network_conf.c | 2 +-
src/conf/node_device_conf.c | 2 +-
src/conf/nwfilter_conf.h | 2 +-
src/conf/nwfilter_params.h | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/conf/storage_encryption_conf.c | 2 +-
src/conf/storage_encryption_conf.h | 2 +-
src/cpu/cpu_powerpc.c | 2 +-
src/cpu/cpu_x86.c | 2 +-
src/esx/esx_vi.c | 2 +-
src/esx/esx_vi_methods.c | 2 +-
src/esx/esx_vi_types.c | 2 +-
src/esx/esx_vi_types.h | 2 +-
src/hyperv/hyperv_wmi.c | 2 +-
src/hyperv/hyperv_wmi.h | 2 +-
src/lxc/lxc_fuse.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/node_device/node_device_udev.c | 2 +-
src/nwfilter/nwfilter_ebiptables_driver.c | 2 +-
src/nwfilter/nwfilter_learnipaddr.c | 2 +-
src/openvz/openvz_conf.c | 2 +-
src/openvz/openvz_driver.c | 2 +-
src/phyp/phyp_driver.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_monitor_text.c | 2 +-
src/remote/remote_driver.c | 2 +-
src/rpc/virnetsshsession.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/test/test_driver.c | 2 +-
src/uml/uml_conf.c | 2 +-
src/uml/uml_driver.c | 2 +-
src/util/command.c | 2 +-
src/util/command.h | 2 +-
src/util/conf.c | 2 +-
src/util/logging.c | 2 +-
src/util/logging.h | 2 +-
src/util/sexpr.h | 2 +-
src/util/sysinfo.h | 2 +-
src/util/util.c | 2 +-
src/util/virbitmap.c | 2 +-
src/util/{buf.c => virbuffer.c} | 2 +-
src/util/{buf.h => virbuffer.h} | 0
src/util/virstring.c | 2 +-
src/util/viruri.c | 2 +-
src/util/xml.c | 2 +-
src/xen/xen_hypervisor.c | 2 +-
src/xen/xend_internal.c | 2 +-
src/xen/xend_internal.h | 2 +-
src/xen/xm_internal.c | 2 +-
src/xenapi/xenapi_driver.c | 2 +-
src/xenapi/xenapi_utils.c | 2 +-
tests/cputest.c | 2 +-
tests/sysinfotest.c | 2 +-
tests/testutils.c | 2 +-
tests/virbuftest.c | 2 +-
tools/virsh-domain.c | 2 +-
tools/virsh-host.c | 2 +-
tools/virsh-interface.c | 2 +-
tools/virsh-network.c | 2 +-
tools/virsh-nodedev.c | 2 +-
tools/virsh-nwfilter.c | 2 +-
tools/virsh-pool.c | 2 +-
tools/virsh-secret.c | 2 +-
tools/virsh-snapshot.c | 2 +-
tools/virsh-volume.c | 2 +-
tools/virsh.c | 2 +-
81 files changed, 80 insertions(+), 80 deletions(-)
rename src/util/{buf.c => virbuffer.c} (99%)
rename src/util/{buf.h => virbuffer.h} (100%)
diff --git a/src/Makefile.am b/src/Makefile.am
index a6cab58..dfda3e7 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/buf.c util/buf.h \
util/command.c util/command.h \
util/conf.c util/conf.h \
util/event.c util/event.h \
@@ -84,6 +83,7 @@ UTIL_SOURCES = \
util/virauth.c util/virauth.h \
util/virauthconfig.c util/virauthconfig.h \
util/virbitmap.c util/virbitmap.h \
+ util/virbuffer.c util/virbuffer.h \
util/virfile.c util/virfile.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virobject.c util/virobject.h \
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 7cdb5b7..76db89a 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -26,7 +26,7 @@
#include <strings.h>
#include "capabilities.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "uuid.h"
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 3cdbcaa..19b99c6 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -25,7 +25,7 @@
# define __VIR_CAPABILITIES_H
# include "internal.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "cpu_conf.h"
# include "virarch.h"
# include "virmacaddr.h"
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 3973c83..9b86571 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -26,7 +26,7 @@
#include "virterror_internal.h"
#include "memory.h"
#include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "cpu_conf.h"
#include "domain_conf.h"
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index bd6dfd9..368c26b 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -25,7 +25,7 @@
# define __VIR_CPU_CONF_H__
# include "util.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "xml.h"
# include "virbitmap.h"
# include "virarch.h"
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index 7b97f45..daf57bc 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -27,7 +27,7 @@
#include "xml.h"
#include "uuid.h"
#include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "device_conf.h"
#define VIR_FROM_THIS VIR_FROM_DEVICE
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index 5318738..09d6be9 100644
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -30,7 +30,7 @@
# include "internal.h"
# include "util.h"
# include "threads.h"
-# include "buf.h"
+# include "virbuffer.h"
enum virDeviceAddressPciMulti {
VIR_DEVICE_ADDRESS_PCI_MULTI_DEFAULT = 0,
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ff6d979..a5cd0e7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -39,7 +39,7 @@
#include "xml.h"
#include "uuid.h"
#include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "logging.h"
#include "nwfilter_conf.h"
#include "storage_file.h"
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index fc3602a..738ef33 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -31,7 +31,7 @@
#include "xml.h"
#include "uuid.h"
#include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
#define VIR_FROM_THIS VIR_FROM_INTERFACE
diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index 0080165..216a540 100644
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -25,7 +25,7 @@
# include "internal.h"
# include "virnetdevbandwidth.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "xml.h"
virNetDevBandwidthPtr virNetDevBandwidthParse(xmlNodePtr node,
diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h
index 81b0d84..19b50cc 100644
--- a/src/conf/netdev_vlan_conf.h
+++ b/src/conf/netdev_vlan_conf.h
@@ -24,7 +24,7 @@
# include "internal.h"
# include "virnetdevvlan.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "xml.h"
int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def);
diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h
index d6d58ef..15ecbd6 100644
--- a/src/conf/netdev_vport_profile_conf.h
+++ b/src/conf/netdev_vport_profile_conf.h
@@ -25,7 +25,7 @@
# include "internal.h"
# include "virnetdevvportprofile.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "xml.h"
typedef enum {
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index ff7366d..42cb87e 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -41,7 +41,7 @@
#include "xml.h"
#include "uuid.h"
#include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "c-ctype.h"
#include "virfile.h"
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 41fa8e4..50fcf0b 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -34,7 +34,7 @@
#include "memory.h"
#include "xml.h"
#include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "uuid.h"
#include "pci.h"
#include "virrandom.h"
diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 805fbe7..d597064 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -31,7 +31,7 @@
# include "util.h"
# include "virhash.h"
# include "xml.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "virsocketaddr.h"
# include "virmacaddr.h"
diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h
index 6c3ce54..ac57796 100644
--- a/src/conf/nwfilter_params.h
+++ b/src/conf/nwfilter_params.h
@@ -24,7 +24,7 @@
# define NWFILTER_PARAMS_H
# include "virhash.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "virmacaddr.h"
enum virNWFilterVarValueType {
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index a6b4934..ec67f57 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "datatypes.h"
#include "logging.h"
#include "memory.h"
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 95b7943..38a3e2a 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -30,7 +30,7 @@
#include "internal.h"
#include "virbitmap.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "count-one-bits.h"
#include "datatypes.h"
#include "domain_conf.h"
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index ad0f0c1..b81c08c 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -40,7 +40,7 @@
#include "xml.h"
#include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "memory.h"
#include "virfile.h"
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index a8b1397..0c2bded 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -27,7 +27,7 @@
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "storage_conf.h"
#include "storage_encryption_conf.h"
diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h
index e063478..40a8497 100644
--- a/src/conf/storage_encryption_conf.h
+++ b/src/conf/storage_encryption_conf.h
@@ -24,7 +24,7 @@
# define __VIR_STORAGE_ENCRYPTION_H__
# include "internal.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "util.h"
# include <libxml/tree.h>
diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index ac10789..36d601e 100644
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -32,7 +32,7 @@
#include "cpu.h"
#include "cpu_map.h"
-#include "buf.h"
+#include "virbuffer.h"
#define VIR_FROM_THIS VIR_FROM_CPU
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index cb21910..1447141 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -31,7 +31,7 @@
#include "cpu.h"
#include "cpu_map.h"
#include "cpu_x86.h"
-#include "buf.h"
+#include "virbuffer.h"
#define VIR_FROM_THIS VIR_FROM_CPU
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 564b35c..d645bfb 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -26,7 +26,7 @@
#include <libxml/parser.h>
#include <libxml/xpathInternals.h>
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "logging.h"
#include "util.h"
diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index 0f9d612..a3c3c8b 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "logging.h"
#include "uuid.h"
diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index 0146728..1654e1b 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -27,7 +27,7 @@
#include <libxml/parser.h>
#include <libxml/xpathInternals.h>
-#include "buf.h"
+#include "virbuffer.h"
#include "datatypes.h"
#include "memory.h"
#include "logging.h"
diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h
index a250bf8..92dc16f 100644
--- a/src/esx/esx_vi_types.h
+++ b/src/esx/esx_vi_types.h
@@ -23,7 +23,7 @@
#ifndef __ESX_VI_TYPES_H__
# define __ESX_VI_TYPES_H__
-# include "buf.h"
+# include "virbuffer.h"
typedef enum _esxVI_Type esxVI_Type;
typedef struct _esxVI_Object esxVI_Object;
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 4023588..0a6b107 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -31,7 +31,7 @@
#include "memory.h"
#include "util.h"
#include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "hyperv_private.h"
#include "hyperv_wmi.h"
diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index d9e8578..85a2bbc 100644
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -25,7 +25,7 @@
#ifndef __HYPERV_WMI_H__
# define __HYPERV_WMI_H__
-# include "buf.h"
+# include "virbuffer.h"
# include "hyperv_private.h"
# include "hyperv_wmi_classes.h"
# include "openwsman.h"
diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index e0c51aa..4e7df55 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -34,7 +34,7 @@
#include "virterror_internal.h"
#include "logging.h"
#include "virfile.h"
-#include "buf.h"
+#include "virbuffer.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 9740fbd..48c047e 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -50,7 +50,7 @@
#include "network_conf.h"
#include "device_conf.h"
#include "driver.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "virpidfile.h"
#include "util.h"
#include "command.h"
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index c9ca00c..b3499fb 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -36,7 +36,7 @@
#include "memory.h"
#include "uuid.h"
#include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "pci.h"
#define VIR_FROM_THIS VIR_FROM_NODEDEV
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c
b/src/nwfilter/nwfilter_ebiptables_driver.c
index cdf0efc..5cfc036 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -30,7 +30,7 @@
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "logging.h"
#include "virterror_internal.h"
diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 85e0e7e..361bdce 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -41,7 +41,7 @@
#include "internal.h"
#include "intprops.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "logging.h"
#include "datatypes.h"
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 089f63b..30fd2e3 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -46,7 +46,7 @@
#include "openvz_conf.h"
#include "openvz_util.h"
#include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "nodeinfo.h"
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index fd6ecf8..1e97448 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -48,7 +48,7 @@
#include "datatypes.h"
#include "openvz_driver.h"
#include "openvz_util.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "openvz_conf.h"
#include "nodeinfo.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index c82acb6..e81bc09 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -46,7 +46,7 @@
#include "virauth.h"
#include "util.h"
#include "datatypes.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "logging.h"
#include "driver.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index d890ff1..a796aa9 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -40,7 +40,7 @@
#include "qemu_capabilities.h"
#include "qemu_bridge_filter.h"
#include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "conf.h"
#include "util.h"
#include "memory.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7e8a1d8..8c1fa60 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -61,7 +61,7 @@
#include "virterror_internal.h"
#include "logging.h"
#include "datatypes.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "nodeinfo.h"
#include "stats_linux.h"
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index fa10600..a12adb6 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -39,7 +39,7 @@
#include "driver.h"
#include "datatypes.h"
#include "virterror_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#ifdef WITH_DTRACE_PROBES
# include "libvirt_qemu_probes.h"
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 5cc7e32..f32e88e 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -34,7 +34,7 @@
#include "datatypes.h"
#include "domain_event.h"
#include "driver.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "remote_driver.h"
#include "remote_protocol.h"
#include "qemu_protocol.h"
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 286cc4d..d890569 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -26,7 +26,7 @@
#include "virnetsshsession.h"
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "logging.h"
#include "configmake.h"
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index c07e69d..5cfc87c 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -40,7 +40,7 @@
#include <locale.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "memory.h"
#include "command.h"
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 256be92..63066be 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -35,7 +35,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "test_driver.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "uuid.h"
#include "capabilities.h"
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 7414969..2bc07a9 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -36,7 +36,7 @@
#include "uml_conf.h"
#include "uuid.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "conf.h"
#include "util.h"
#include "memory.h"
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 887dca6..8dece66 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -46,7 +46,7 @@
#include "uml_driver.h"
#include "uml_conf.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "nodeinfo.h"
#include "stats_linux.h"
diff --git a/src/util/command.c b/src/util/command.c
index ebdd636..fbd9ff8 100644
--- a/src/util/command.c
+++ b/src/util/command.c
@@ -41,7 +41,7 @@
#include "virfile.h"
#include "virpidfile.h"
#include "virprocess.h"
-#include "buf.h"
+#include "virbuffer.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/command.h b/src/util/command.h
index 177a0eb..6c8ab49 100644
--- a/src/util/command.h
+++ b/src/util/command.h
@@ -24,7 +24,7 @@
# include "internal.h"
# include "util.h"
-# include "buf.h"
+# include "virbuffer.h"
typedef struct _virCommand virCommand;
typedef virCommand *virCommandPtr;
diff --git a/src/util/conf.c b/src/util/conf.c
index ba80097..3b97545 100644
--- a/src/util/conf.c
+++ b/src/util/conf.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include "virterror_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "conf.h"
#include "util.h"
#include "c-ctype.h"
diff --git a/src/util/logging.c b/src/util/logging.c
index e8fed55..0df3549 100644
--- a/src/util/logging.c
+++ b/src/util/logging.c
@@ -44,7 +44,7 @@
#include "logging.h"
#include "memory.h"
#include "util.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "threads.h"
#include "virfile.h"
#include "virtime.h"
diff --git a/src/util/logging.h b/src/util/logging.h
index 52feecc..028b791 100644
--- a/src/util/logging.h
+++ b/src/util/logging.h
@@ -23,7 +23,7 @@
# define __VIRTLOG_H_
# include "internal.h"
-# include "buf.h"
+# include "virbuffer.h"
/*
* To be made public
diff --git a/src/util/sexpr.h b/src/util/sexpr.h
index b4b41ed..13ec481 100644
--- a/src/util/sexpr.h
+++ b/src/util/sexpr.h
@@ -13,7 +13,7 @@
# define _LIBVIR_SEXPR_H_
# include "internal.h"
-# include "buf.h"
+# include "virbuffer.h"
enum sexpr_type {
SEXPR_NIL,
diff --git a/src/util/sysinfo.h b/src/util/sysinfo.h
index 40a100a..0b1f000 100644
--- a/src/util/sysinfo.h
+++ b/src/util/sysinfo.h
@@ -26,7 +26,7 @@
# include "internal.h"
# include "util.h"
-# include "buf.h"
+# include "virbuffer.h"
enum virSysinfoType {
VIR_SYSINFO_SMBIOS,
diff --git a/src/util/util.c b/src/util/util.c
index 05e7ca7..422ee75 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -77,7 +77,7 @@
#include "dirname.h"
#include "virterror_internal.h"
#include "logging.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "storage_file.h"
#include "memory.h"
diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index 0f13389..41b74d4 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -32,7 +32,7 @@
#include "virbitmap.h"
#include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "c-ctype.h"
#include "count-one-bits.h"
diff --git a/src/util/buf.c b/src/util/virbuffer.c
similarity index 99%
rename from src/util/buf.c
rename to src/util/virbuffer.c
index 030dc97..e4409c6 100644
--- a/src/util/buf.c
+++ b/src/util/virbuffer.c
@@ -30,7 +30,7 @@
#define __VIR_BUFFER_C__
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
diff --git a/src/util/buf.h b/src/util/virbuffer.h
similarity index 100%
rename from src/util/buf.h
rename to src/util/virbuffer.h
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 1917e9a..228c3fb 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -23,7 +23,7 @@
#include "virstring.h"
#include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/viruri.c b/src/util/viruri.c
index 26dbf24..dd3b878 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -25,7 +25,7 @@
#include "memory.h"
#include "util.h"
#include "virterror_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#define VIR_FROM_THIS VIR_FROM_URI
diff --git a/src/util/xml.c b/src/util/xml.c
index 84db865..5b08b1f 100644
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -32,7 +32,7 @@
#include "virterror_internal.h"
#include "xml.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "util.h"
#include "memory.h"
#include "virfile.h"
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 1a959cd..f7daaa6 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -73,7 +73,7 @@
#include "stats_linux.h"
#include "block_stats.h"
#include "xend_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "capabilities.h"
#include "memory.h"
#include "threads.h"
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 922c571..9407e95 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -37,7 +37,7 @@
#include "util.h"
#include "sexpr.h"
#include "xen_sxpr.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "uuid.h"
#include "xen_driver.h"
#include "xen_hypervisor.h"
diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h
index 5942788..06c75e1 100644
--- a/src/xen/xend_internal.h
+++ b/src/xen/xend_internal.h
@@ -23,7 +23,7 @@
# include "capabilities.h"
# include "domain_conf.h"
# include "driver.h"
-# include "buf.h"
+# include "virbuffer.h"
# include "viruri.h"
int
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 9da2974..2cd4b95 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -43,7 +43,7 @@
#include "xen_sxpr.h"
#include "xen_xm.h"
#include "virhash.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "uuid.h"
#include "util.h"
#include "memory.h"
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 2d26cae..502c653 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -34,7 +34,7 @@
#include "util.h"
#include "uuid.h"
#include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "viruri.h"
#include "xenapi_driver.h"
#include "xenapi_driver_private.h"
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 8c906f4..dbdb22d 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -32,7 +32,7 @@
#include "util.h"
#include "uuid.h"
#include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "logging.h"
#include "viruri.h"
#include "xenapi_driver_private.h"
diff --git a/tests/cputest.c b/tests/cputest.c
index c789d70..4a54c9f 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "xml.h"
#include "memory.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "testutils.h"
#include "cpu_conf.h"
#include "cpu/cpu.h"
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 79ee128..9340af2 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -30,7 +30,7 @@
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "sysinfo.h"
#include "testutils.h"
#include "util.h"
diff --git a/tests/testutils.c b/tests/testutils.c
index 3d2e491..e8b48e8 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -43,7 +43,7 @@
#include "util.h"
#include "threads.h"
#include "virterror_internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "logging.h"
#include "command.h"
#include "virrandom.h"
diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index 35ba997..53b9bbe 100644
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -7,7 +7,7 @@
#include "internal.h"
#include "util.h"
#include "testutils.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#define TEST_ERROR(...) \
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 765f30c..76d9d51 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -38,7 +38,7 @@
#include "internal.h"
#include "virbitmap.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "c-ctype.h"
#include "conf/domain_conf.h"
#include "console.h"
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 3d13e01..f687780 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -32,7 +32,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "virsh-domain.h"
diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 3a6285b..956fee8 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -32,7 +32,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index fd9d563..c5d494a 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -32,7 +32,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 8cf96be..52cd874 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -32,7 +32,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 5e79191..3108d1b 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -32,7 +32,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 5fee2cd..4a78467 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -32,7 +32,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index 52879e1..ee79b97 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "base64.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 8ec6456..d6a381d 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -34,7 +34,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "virsh-domain.h"
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 21a2df0..1bad6b1 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -34,7 +34,7 @@
#include <libxml/xmlsave.h>
#include "internal.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "memory.h"
#include "util.h"
#include "virfile.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 2f7d4a3..82c03e4 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -56,7 +56,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "base64.h"
-#include "buf.h"
+#include "virbuffer.h"
#include "console.h"
#include "util.h"
#include "memory.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 04/28] Rename command.{c, h} to vircommand.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
cfg.mk | 4 ++--
daemon/remote.c | 2 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/fdstream.h | 2 +-
src/libvirt.c | 2 +-
src/libxl/libxl_driver.c | 2 +-
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/network/bridge_driver.h | 2 +-
src/nwfilter/nwfilter_ebiptables_driver.c | 2 +-
src/openvz/openvz_conf.c | 2 +-
src/openvz/openvz_driver.c | 2 +-
src/openvz/openvz_util.c | 2 +-
src/parallels/parallels_driver.c | 2 +-
src/parallels/parallels_utils.c | 2 +-
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.h | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/remote/remote_driver.c | 2 +-
src/rpc/virnetsocket.h | 2 +-
src/security/security_apparmor.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/storage/storage_backend.h | 2 +-
src/storage/storage_backend_disk.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/storage/storage_backend_iscsi.c | 2 +-
src/storage/storage_backend_logical.c | 2 +-
src/storage/storage_backend_scsi.c | 2 +-
src/storage/storage_backend_sheepdog.c | 2 +-
src/uml/uml_conf.c | 2 +-
src/uml/uml_conf.h | 2 +-
src/util/dnsmasq.c | 2 +-
src/util/ebtables.c | 2 +-
src/util/hooks.c | 2 +-
src/util/iptables.c | 2 +-
src/util/pci.c | 2 +-
src/util/storage_file.c | 2 +-
src/util/sysinfo.c | 2 +-
src/util/util.c | 2 +-
src/util/{command.c => vircommand.c} | 4 ++--
src/util/{command.h => vircommand.h} | 2 +-
src/util/virfile.c | 2 +-
src/util/virnetdev.c | 2 +-
src/util/virnetdevbandwidth.c | 2 +-
src/util/virnetdevopenvswitch.c | 2 +-
src/util/virnetdevveth.c | 2 +-
src/util/virnodesuspend.c | 2 +-
src/vmware/vmware_conf.c | 2 +-
src/vmware/vmware_driver.c | 2 +-
src/xen/xen_driver.c | 2 +-
tests/commandtest.c | 2 +-
tests/networkxml2conftest.c | 2 +-
tests/reconnect.c | 2 +-
tests/statstest.c | 2 +-
tests/testutils.c | 2 +-
tests/virnettlscontexttest.c | 2 +-
tools/virsh.c | 2 +-
61 files changed, 63 insertions(+), 63 deletions(-)
rename src/util/{command.c => vircommand.c} (99%)
rename src/util/{command.h => vircommand.h} (99%)
diff --git a/cfg.mk b/cfg.mk
index 84cc942..f4431c0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -745,7 +745,7 @@ $(srcdir)/src/remote/remote_client_bodies.h:
$(srcdir)/src/remote/remote_protoco
# List all syntax-check exemptions:
exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$
-_src1=libvirt|fdstream|qemu/qemu_monitor|util/(command|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
+_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
exclude_file_name_regexp--sc_avoid_write = \
^(src/($(_src1))|daemon/libvirtd|tools/console|tests/(shunload|virnettlscontext)test)\.c$$
@@ -778,7 +778,7 @@ exclude_file_name_regexp--sc_prohibit_close = \
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
(^tests/(qemuhelp|nodeinfo)data/|\.(gif|ico|png|diff)$$)
-_src2=src/(util/command|libvirt|lxc/lxc_controller|locking/lock_daemon)
+_src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon)
exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
(^($(_src2)|tests/testutils|daemon/libvirtd)\.c$$)
diff --git a/daemon/remote.c b/daemon/remote.c
index d3c5c10..3cee038 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -39,7 +39,7 @@
#include "stream.h"
#include "uuid.h"
#include "libvirt/libvirt-qemu.h"
-#include "command.h"
+#include "vircommand.h"
#include "intprops.h"
#include "virnetserverservice.h"
#include "virnetserver.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5f68e4..7b4567b 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/command.c
src/util/conf.c
src/util/dnsmasq.c
src/util/event_poll.c
@@ -158,6 +157,7 @@ src/util/viraudit.c
src/util/virauth.c
src/util/virauthconfig.c
src/util/vircgroup.c
+src/util/vircommand.c
src/util/virdbus.c
src/util/virfile.c
src/util/virhash.c
diff --git a/src/Makefile.am b/src/Makefile.am
index dfda3e7..53d1bd4 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/command.c util/command.h \
util/conf.c util/conf.h \
util/event.c util/event.h \
util/event_poll.c util/event_poll.h \
@@ -84,6 +83,7 @@ UTIL_SOURCES = \
util/virauthconfig.c util/virauthconfig.h \
util/virbitmap.c util/virbitmap.h \
util/virbuffer.c util/virbuffer.h \
+ util/vircommand.c util/vircommand.h \
util/virfile.c util/virfile.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virobject.c util/virobject.h \
diff --git a/src/fdstream.h b/src/fdstream.h
index 65457d8..d6f5a7a 100644
--- a/src/fdstream.h
+++ b/src/fdstream.h
@@ -24,7 +24,7 @@
# define __VIR_FDSTREAM_H_
# include "internal.h"
-# include "command.h"
+# include "vircommand.h"
/* internal callback, the generic one is used up by daemon stream driver */
/* the close callback is called with fdstream private data locked */
diff --git a/src/libvirt.c b/src/libvirt.c
index 4215971..e28ed05 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -56,7 +56,7 @@
#include "intprops.h"
#include "conf.h"
#include "rpc/virnettlscontext.h"
-#include "command.h"
+#include "vircommand.h"
#include "virrandom.h"
#include "viruri.h"
#include "threads.h"
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index f4bded1..f03008f 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -38,7 +38,7 @@
#include "virfile.h"
#include "memory.h"
#include "uuid.h"
-#include "command.h"
+#include "vircommand.h"
#include "libxl.h"
#include "libxl_driver.h"
#include "libxl_conf.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 37b1e33..0c4e676 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -61,8 +61,8 @@
#include "virnetdevveth.h"
#include "uuid.h"
#include "virfile.h"
-#include "command.h"
#include "hostusb.h"
+#include "vircommand.h"
#include "virnetdev.h"
#include "virprocess.h"
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 34f38c8..bfe2126 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -66,7 +66,7 @@
#include "util.h"
#include "virfile.h"
#include "virpidfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "processinfo.h"
#include "nodeinfo.h"
#include "virrandom.h"
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 5c548c2..e5f1ce2 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -42,7 +42,7 @@
#include "domain_audit.h"
#include "virterror_internal.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "hooks.h"
#include "lxc_hostdev.h"
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 48c047e..84098de 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -53,7 +53,7 @@
#include "virbuffer.h"
#include "virpidfile.h"
#include "util.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "uuid.h"
#include "iptables.h"
diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index 43fefc0..fea27e0 100644
--- a/src/network/bridge_driver.h
+++ b/src/network/bridge_driver.h
@@ -30,7 +30,7 @@
# include "internal.h"
# include "network_conf.h"
# include "domain_conf.h"
-# include "command.h"
+# include "vircommand.h"
# include "dnsmasq.h"
int networkRegister(void);
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c
b/src/nwfilter/nwfilter_ebiptables_driver.c
index 5cfc036..6966acf 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -40,7 +40,7 @@
#include "nwfilter_gentech_driver.h"
#include "nwfilter_ebiptables_driver.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "configmake.h"
#include "intprops.h"
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 30fd2e3..5448a33 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -51,7 +51,7 @@
#include "util.h"
#include "nodeinfo.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_OPENVZ
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 1e97448..9297777 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -56,7 +56,7 @@
#include "virfile.h"
#include "virtypedparam.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "viruri.h"
#include "stats_linux.h"
diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index 111045f..4163e19 100644
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "virterror_internal.h"
-#include "command.h"
+#include "vircommand.h"
#include "datatypes.h"
#include "memory.h"
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 1e60115..6414913 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -45,7 +45,7 @@
#include "memory.h"
#include "util.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "configmake.h"
#include "storage_file.h"
#include "nodeinfo.h"
diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index 521fd97..e47ff76 100644
--- a/src/parallels/parallels_utils.c
+++ b/src/parallels/parallels_utils.c
@@ -24,7 +24,7 @@
#include <stdarg.h>
-#include "command.h"
+#include "vircommand.h"
#include "virterror_internal.h"
#include "memory.h"
#include "json.h"
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f07f6bb..98da9a4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -34,7 +34,7 @@
#include "nodeinfo.h"
#include "cpu/cpu.h"
#include "domain_conf.h"
-#include "command.h"
+#include "vircommand.h"
#include "virbitmap.h"
#include "virnodesuspend.h"
#include "qemu_monitor.h"
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 700b0ac..3457852 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -26,7 +26,7 @@
# include "virobject.h"
# include "capabilities.h"
-# include "command.h"
+# include "vircommand.h"
# include "virobject.h"
# include "qemu_monitor.h"
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index d2fe215..e15830a 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -25,7 +25,7 @@
# define __QEMU_COMMAND_H__
# include "domain_conf.h"
-# include "command.h"
+# include "vircommand.h"
# include "capabilities.h"
# include "qemu_conf.h"
# include "qemu_domain.h"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index bcf21c3..eafaf9f 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -40,7 +40,7 @@
# include "cpu_conf.h"
# include "driver.h"
# include "virbitmap.h"
-# include "command.h"
+# include "vircommand.h"
# include "threadpool.h"
# include "locking/lock_manager.h"
# include "qemu_capabilities.h"
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index f32e88e..8b77e7d 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -41,7 +41,7 @@
#include "memory.h"
#include "util.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "intprops.h"
#include "virtypedparam.h"
#include "viruri.h"
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index e024640..fcd54dd 100644
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -25,7 +25,7 @@
# define __VIR_NET_SOCKET_H__
# include "virsocketaddr.h"
-# include "command.h"
+# include "vircommand.h"
# include "virnettlscontext.h"
# include "virobject.h"
# ifdef HAVE_SASL
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index f57b81f..fff1bdc 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -47,7 +47,7 @@
#include "hostusb.h"
#include "virfile.h"
#include "configmake.h"
-#include "command.h"
+#include "vircommand.h"
#include "logging.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 5cfc87c..03ce4fe 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -43,7 +43,7 @@
#include "virbuffer.h"
#include "util.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#include "security_driver.h"
#include "security_apparmor.h"
diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h
index c991015..56b6797 100644
--- a/src/storage/storage_backend.h
+++ b/src/storage/storage_backend.h
@@ -26,7 +26,7 @@
# include "internal.h"
# include "storage_conf.h"
-# include "command.h"
+# include "vircommand.h"
typedef char * (*virStorageBackendFindPoolSources)(virConnectPtr conn, const char
*srcSpec, unsigned int flags);
typedef int (*virStorageBackendCheckPool)(virConnectPtr conn, virStoragePoolObjPtr pool,
bool *active);
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 06b5909..c6aa407 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -31,7 +31,7 @@
#include "storage_backend_disk.h"
#include "util.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#include "configmake.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index fcc46b7..cdf93af 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -45,7 +45,7 @@
#include "storage_backend_fs.h"
#include "storage_conf.h"
#include "storage_file.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "xml.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index b080250..c468b1b 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -41,7 +41,7 @@
#include "memory.h"
#include "logging.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "virrandom.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_logical.c
b/src/storage/storage_backend_logical.c
index fd5cbd1..53e6c61 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -34,7 +34,7 @@
#include "virterror_internal.h"
#include "storage_backend_logical.h"
#include "storage_conf.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "logging.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 4e832eb..6515e57 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -33,7 +33,7 @@
#include "memory.h"
#include "logging.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_sheepdog.c
b/src/storage/storage_backend_sheepdog.c
index 66d8fb4..ecca7a8 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -29,7 +29,7 @@
#include "virterror_internal.h"
#include "storage_backend_sheepdog.h"
#include "storage_conf.h"
-#include "util/command.h"
+#include "vircommand.h"
#include "util.h"
#include "memory.h"
#include "logging.h"
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 2bc07a9..8f72658 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -44,7 +44,7 @@
#include "logging.h"
#include "domain_nwfilter.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "virnetdevtap.h"
#include "virnodesuspend.h"
diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index 9bddedc..09a0305 100644
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -31,7 +31,7 @@
# include "domain_event.h"
# include "virterror_internal.h"
# include "threads.h"
-# include "command.h"
+# include "vircommand.h"
# include "virhash.h"
# define umlDebug(fmt, ...) do {} while(0)
diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c
index dfd6034..18be2ff 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/dnsmasq.c
@@ -42,7 +42,7 @@
#include "virbitmap.h"
#include "dnsmasq.h"
#include "util.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/util/ebtables.c b/src/util/ebtables.c
index f1b2986..4b427ee 100644
--- a/src/util/ebtables.c
+++ b/src/util/ebtables.c
@@ -41,7 +41,7 @@
#include "internal.h"
#include "ebtables.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/util/hooks.c b/src/util/hooks.c
index 8817a4e..a6c056d 100644
--- a/src/util/hooks.c
+++ b/src/util/hooks.c
@@ -37,7 +37,7 @@
#include "memory.h"
#include "virfile.h"
#include "configmake.h"
-#include "command.h"
+#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_HOOK
diff --git a/src/util/iptables.c b/src/util/iptables.c
index 00a1c29..25253ff 100644
--- a/src/util/iptables.c
+++ b/src/util/iptables.c
@@ -39,7 +39,7 @@
#include "internal.h"
#include "iptables.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/util/pci.c b/src/util/pci.c
index 5971764..bf46fca 100644
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -36,7 +36,7 @@
#include "logging.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#include "virterror_internal.h"
#include "virfile.h"
diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index 3f85e0e..eebf59a 100644
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -24,7 +24,6 @@
#include <config.h>
#include "storage_file.h"
-#include <command.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
@@ -41,6 +40,7 @@
#include "logging.h"
#include "virfile.h"
#include "c-ctype.h"
+#include "vircommand.h"
#include "virhash.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index 6a5db80..2f5c161 100644
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -35,7 +35,7 @@
#include "util.h"
#include "logging.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_SYSINFO
diff --git a/src/util/util.c b/src/util/util.c
index 422ee75..f8ba7b4 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -84,7 +84,7 @@
#include "threads.h"
#include "verify.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "nonblocking.h"
#include "passfd.h"
#include "virprocess.h"
diff --git a/src/util/command.c b/src/util/vircommand.c
similarity index 99%
rename from src/util/command.c
rename to src/util/vircommand.c
index fbd9ff8..3046658 100644
--- a/src/util/command.c
+++ b/src/util/vircommand.c
@@ -1,5 +1,5 @@
/*
- * command.c: Child command execution
+ * vircommand.c: Child command execution
*
* Copyright (C) 2010-2012 Red Hat, Inc.
*
@@ -33,7 +33,7 @@
# include <cap-ng.h>
#endif
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "util.h"
diff --git a/src/util/command.h b/src/util/vircommand.h
similarity index 99%
rename from src/util/command.h
rename to src/util/vircommand.h
index 6c8ab49..4c88165 100644
--- a/src/util/command.h
+++ b/src/util/vircommand.h
@@ -1,5 +1,5 @@
/*
- * command.h: Child command execution
+ * vircommand.h: Child command execution
*
* Copyright (C) 2010-2011 Red Hat, Inc.
*
diff --git a/src/util/virfile.c b/src/util/virfile.c
index c79ef04..d77b726 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -37,7 +37,7 @@
# include <sys/ioctl.h>
#endif
-#include "command.h"
+#include "vircommand.h"
#include "configmake.h"
#include "memory.h"
#include "virterror_internal.h"
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index c345013..e98a2ca 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -26,7 +26,7 @@
#include "virmacaddr.h"
#include "virfile.h"
#include "virterror_internal.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "pci.h"
#include "logging.h"
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 19c00b6..bd75a9d 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "virnetdevbandwidth.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index 5bce611..983a240 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "virnetdevopenvswitch.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
#include "virmacaddr.h"
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index 4166ee0..3261337 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -28,7 +28,7 @@
#include "virnetdevveth.h"
#include "memory.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index f80920e..a34ca6a 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "virnodesuspend.h"
-#include "command.h"
+#include "vircommand.h"
#include "threads.h"
#include "datatypes.h"
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index bada4a5..f82fcb3 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -23,7 +23,7 @@
#include <string.h>
-#include "command.h"
+#include "vircommand.h"
#include "cpu/cpu.h"
#include "dirname.h"
#include "memory.h"
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 3e7397f..d9a1333 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -30,7 +30,7 @@
#include "memory.h"
#include "util.h"
#include "uuid.h"
-#include "command.h"
+#include "vircommand.h"
#include "vmx.h"
#include "vmware_conf.h"
#include "vmware_driver.h"
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index d2de141..d9174b6 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -62,7 +62,7 @@
#include "fdstream.h"
#include "virfile.h"
#include "viruri.h"
-#include "command.h"
+#include "vircommand.h"
#include "virnodesuspend.h"
#include "nodeinfo.h"
#include "configmake.h"
diff --git a/tests/commandtest.c b/tests/commandtest.c
index 19bf9ba..f76bc54 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -33,7 +33,7 @@
#include "nodeinfo.h"
#include "util.h"
#include "memory.h"
-#include "command.h"
+#include "vircommand.h"
#include "virfile.h"
#include "virpidfile.h"
#include "virterror_internal.h"
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index 1888465..dc0e064 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -11,7 +11,7 @@
#include "internal.h"
#include "testutils.h"
#include "network_conf.h"
-#include "command.h"
+#include "vircommand.h"
#include "memory.h"
#include "network/bridge_driver.h"
diff --git a/tests/reconnect.c b/tests/reconnect.c
index 90af830..4031360 100644
--- a/tests/reconnect.c
+++ b/tests/reconnect.c
@@ -6,7 +6,7 @@
#include "internal.h"
#include "testutils.h"
-#include "command.h"
+#include "vircommand.h"
static void errorHandler(void *userData ATTRIBUTE_UNUSED,
virErrorPtr error ATTRIBUTE_UNUSED) {
diff --git a/tests/statstest.c b/tests/statstest.c
index 8c40082..ad71bf9 100644
--- a/tests/statstest.c
+++ b/tests/statstest.c
@@ -9,7 +9,7 @@
#include "internal.h"
#include "xen/block_stats.h"
#include "testutils.h"
-#include "command.h"
+#include "vircommand.h"
static void testQuietError(void *userData ATTRIBUTE_UNUSED,
virErrorPtr error ATTRIBUTE_UNUSED)
diff --git a/tests/testutils.c b/tests/testutils.c
index e8b48e8..1315cb5 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -45,7 +45,7 @@
#include "virterror_internal.h"
#include "virbuffer.h"
#include "logging.h"
-#include "command.h"
+#include "vircommand.h"
#include "virrandom.h"
#include "dirname.h"
#include "virprocess.h"
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index cc260e0..d421feb 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -32,7 +32,7 @@
#include "memory.h"
#include "logging.h"
#include "virfile.h"
-#include "command.h"
+#include "vircommand.h"
#include "virsocketaddr.h"
#include "gnutls_1_0_compat.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 82c03e4..07da077 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -66,7 +66,7 @@
#include "event_poll.h"
#include "configmake.h"
#include "threads.h"
-#include "command.h"
+#include "vircommand.h"
#include "virkeycode.h"
#include "virnetdevbandwidth.h"
#include "virbitmap.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 05/28] Rename conf.{c,h} to virconf.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
daemon/libvirtd-config.c | 2 +-
daemon/libvirtd.c | 2 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/libvirt.c | 2 +-
src/libxl/libxl_driver.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/locking/lock_daemon_config.c | 2 +-
src/locking/lock_driver_lockd.c | 2 +-
src/locking/lock_driver_sanlock.c | 2 +-
src/locking/sanlock_helper.c | 2 +-
src/lxc/lxc_conf.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/security/security_selinux.c | 2 +-
src/uml/uml_conf.c | 2 +-
src/util/{conf.c => virconf.c} | 2 +-
src/util/{conf.h => virconf.h} | 0
src/vmx/vmx.c | 2 +-
src/vmx/vmx.h | 2 +-
src/xen/xen_inotify.c | 2 +-
src/xen/xm_internal.h | 2 +-
src/xenxs/xen_sxpr.c | 2 +-
src/xenxs/xen_sxpr.h | 2 +-
src/xenxs/xen_xm.c | 2 +-
src/xenxs/xen_xm.h | 2 +-
tests/conftest.c | 2 +-
tests/libvirtdconftest.c | 2 +-
27 files changed, 26 insertions(+), 26 deletions(-)
rename src/util/{conf.c => virconf.c} (99%)
rename src/util/{conf.h => virconf.h} (100%)
diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 7838044..0ca185c 100644
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "libvirtd-config.h"
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index f88be9b..9b0e45a 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -47,7 +47,7 @@
#include "uuid.h"
#include "remote_driver.h"
#include "memory.h"
-#include "conf.h"
+#include "virconf.h"
#include "virnetlink.h"
#include "virnetserver.h"
#include "threads.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7b4567b..6dcda84 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/conf.c
src/util/dnsmasq.c
src/util/event_poll.c
src/util/hooks.c
@@ -158,6 +157,7 @@ src/util/virauth.c
src/util/virauthconfig.c
src/util/vircgroup.c
src/util/vircommand.c
+src/util/virconf.c
src/util/virdbus.c
src/util/virfile.c
src/util/virhash.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 53d1bd4..c273883 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/conf.c util/conf.h \
util/event.c util/event.h \
util/event_poll.c util/event_poll.h \
util/hooks.c util/hooks.h \
@@ -84,6 +83,7 @@ UTIL_SOURCES = \
util/virbitmap.c util/virbitmap.h \
util/virbuffer.c util/virbuffer.h \
util/vircommand.c util/vircommand.h \
+ util/virconf.c util/virconf.h \
util/virfile.c util/virfile.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virobject.c util/virobject.h \
diff --git a/src/libvirt.c b/src/libvirt.c
index e28ed05..8f7a869 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -54,7 +54,7 @@
#include "memory.h"
#include "configmake.h"
#include "intprops.h"
-#include "conf.h"
+#include "virconf.h"
#include "rpc/virnettlscontext.h"
#include "vircommand.h"
#include "virrandom.h"
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index f03008f..77457c8 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "logging.h"
#include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
#include "datatypes.h"
#include "virfile.h"
#include "memory.h"
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index d7906c5..08caa16 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -40,7 +40,7 @@
#include "virterror_internal.h"
#include "logging.h"
#include "memory.h"
-#include "conf.h"
+#include "virconf.h"
#include "rpc/virnetserver.h"
#include "virrandom.h"
#include "virhash.h"
diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index c64de67..c2d9a76 100644
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "lock_daemon_config.h"
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 3902ede..c88c5af 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "lock_driver.h"
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
#include "logging.h"
#include "uuid.h"
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index a072343..2eadc07 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -43,7 +43,7 @@
#include "util.h"
#include "virfile.h"
#include "md5.h"
-#include "conf.h"
+#include "virconf.h"
#include "configmake.h"
diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c
index a73b49c..ad69312 100644
--- a/src/locking/sanlock_helper.c
+++ b/src/locking/sanlock_helper.c
@@ -5,7 +5,7 @@
#include "configmake.h"
#include "internal.h"
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
#include "domain_conf.h"
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 9b89ceb..905734b 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -29,7 +29,7 @@
#include "lxc_conf.h"
#include "nodeinfo.h"
#include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
#include "logging.h"
#include "uuid.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index a796aa9..91af49b 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -41,7 +41,7 @@
#include "qemu_bridge_filter.h"
#include "uuid.h"
#include "virbuffer.h"
-#include "conf.h"
+#include "virconf.h"
#include "util.h"
#include "memory.h"
#include "datatypes.h"
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 1f73fd2..4456a20 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -44,7 +44,7 @@
#include "virhash.h"
#include "virrandom.h"
#include "util.h"
-#include "conf.h"
+#include "virconf.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 8f72658..b669b5a 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -37,7 +37,7 @@
#include "uml_conf.h"
#include "uuid.h"
#include "virbuffer.h"
-#include "conf.h"
+#include "virconf.h"
#include "util.h"
#include "memory.h"
#include "nodeinfo.h"
diff --git a/src/util/conf.c b/src/util/virconf.c
similarity index 99%
rename from src/util/conf.c
rename to src/util/virconf.c
index 3b97545..221a1eb 100644
--- a/src/util/conf.c
+++ b/src/util/virconf.c
@@ -32,7 +32,7 @@
#include "virterror_internal.h"
#include "virbuffer.h"
-#include "conf.h"
+#include "virconf.h"
#include "util.h"
#include "c-ctype.h"
#include "logging.h"
diff --git a/src/util/conf.h b/src/util/virconf.h
similarity index 100%
rename from src/util/conf.h
rename to src/util/virconf.h
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index a4d1f2e..4de9f33 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -27,7 +27,7 @@
#include "internal.h"
#include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
#include "logging.h"
#include "uuid.h"
diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h
index 406c27e..f4877b1 100644
--- a/src/vmx/vmx.h
+++ b/src/vmx/vmx.h
@@ -24,7 +24,7 @@
# define __VIR_VMX_H__
# include "internal.h"
-# include "conf.h"
+# include "virconf.h"
# include "domain_conf.h"
typedef struct _virVMXContext virVMXContext;
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 2e40015..bcafdd0 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -32,7 +32,7 @@
#include "driver.h"
#include "memory.h"
#include "xen_driver.h"
-#include "conf.h"
+#include "virconf.h"
#include "domain_conf.h"
#include "xen_inotify.h"
#include "xend_internal.h"
diff --git a/src/xen/xm_internal.h b/src/xen/xm_internal.h
index 98b5ad7..df77ac8 100644
--- a/src/xen/xm_internal.h
+++ b/src/xen/xm_internal.h
@@ -27,7 +27,7 @@
# include "internal.h"
# include "driver.h"
-# include "conf.h"
+# include "virconf.h"
# include "domain_conf.h"
extern struct xenUnifiedDriver xenXMDriver;
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 3e8396b..ed0c9e1 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
#include "verify.h"
#include "uuid.h"
diff --git a/src/xenxs/xen_sxpr.h b/src/xenxs/xen_sxpr.h
index d4502bd..4ff640c 100644
--- a/src/xenxs/xen_sxpr.h
+++ b/src/xenxs/xen_sxpr.h
@@ -28,7 +28,7 @@
# define __VIR_XEN_SXPR_H__
# include "internal.h"
-# include "conf.h"
+# include "virconf.h"
# include "domain_conf.h"
# include "sexpr.h"
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index d1197cd..5e284df 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -27,7 +27,7 @@
#include "internal.h"
#include "virterror_internal.h"
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
#include "verify.h"
#include "uuid.h"
diff --git a/src/xenxs/xen_xm.h b/src/xenxs/xen_xm.h
index c3d0ad4..629a4b3 100644
--- a/src/xenxs/xen_xm.h
+++ b/src/xenxs/xen_xm.h
@@ -27,7 +27,7 @@
# define __VIR_XEN_XM_H__
# include "internal.h"
-# include "conf.h"
+# include "virconf.h"
# include "domain_conf.h"
virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def,
diff --git a/tests/conftest.c b/tests/conftest.c
index 4342a52..aacc526 100644
--- a/tests/conftest.c
+++ b/tests/conftest.c
@@ -5,7 +5,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include "conf.h"
+#include "virconf.h"
#include "memory.h"
int main(int argc, char **argv)
diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index ee1f8a0..c2b02a6 100644
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -28,7 +28,7 @@
#include "c-ctype.h"
#include "virterror_internal.h"
#include "logging.h"
-#include "conf.h"
+#include "virconf.h"
#define VIR_FROM_THIS VIR_FROM_NONE
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 06/28] Rename dnsmasq.{c, h} to virdnsmasq.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/network/bridge_driver.c | 2 +-
src/network/bridge_driver.h | 2 +-
src/util/{dnsmasq.c => virdnsmasq.c} | 2 +-
src/util/{dnsmasq.h => virdnsmasq.h} | 0
6 files changed, 5 insertions(+), 5 deletions(-)
rename src/util/{dnsmasq.c => virdnsmasq.c} (99%)
rename src/util/{dnsmasq.h => virdnsmasq.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6dcda84..6081c26 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/dnsmasq.c
src/util/event_poll.c
src/util/hooks.c
src/util/hostusb.c
@@ -159,6 +158,7 @@ src/util/vircgroup.c
src/util/vircommand.c
src/util/virconf.c
src/util/virdbus.c
+src/util/virdnsmasq.c
src/util/virfile.c
src/util/virhash.c
src/util/virinitctl.c
diff --git a/src/Makefile.am b/src/Makefile.am
index c273883..efb23c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,7 +58,6 @@ UTIL_SOURCES = \
util/hooks.c util/hooks.h \
util/iptables.c util/iptables.h \
util/ebtables.c util/ebtables.h \
- util/dnsmasq.c util/dnsmasq.h \
util/json.c util/json.h \
util/logging.c util/logging.h \
util/memory.c util/memory.h \
@@ -84,6 +83,7 @@ UTIL_SOURCES = \
util/virbuffer.c util/virbuffer.h \
util/vircommand.c util/vircommand.h \
util/virconf.c util/virconf.h \
+ util/virdnsmasq.c util/virdnsmasq.h \
util/virfile.c util/virfile.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virobject.c util/virobject.h \
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 84098de..7bb6b2a 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -58,7 +58,7 @@
#include "uuid.h"
#include "iptables.h"
#include "logging.h"
-#include "dnsmasq.h"
+#include "virdnsmasq.h"
#include "configmake.h"
#include "virnetdev.h"
#include "pci.h"
diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index fea27e0..4bf64ea 100644
--- a/src/network/bridge_driver.h
+++ b/src/network/bridge_driver.h
@@ -31,7 +31,7 @@
# include "network_conf.h"
# include "domain_conf.h"
# include "vircommand.h"
-# include "dnsmasq.h"
+# include "virdnsmasq.h"
int networkRegister(void);
diff --git a/src/util/dnsmasq.c b/src/util/virdnsmasq.c
similarity index 99%
rename from src/util/dnsmasq.c
rename to src/util/virdnsmasq.c
index 18be2ff..b9f72ce 100644
--- a/src/util/dnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -40,7 +40,7 @@
#include "internal.h"
#include "datatypes.h"
#include "virbitmap.h"
-#include "dnsmasq.h"
+#include "virdnsmasq.h"
#include "util.h"
#include "vircommand.h"
#include "memory.h"
diff --git a/src/util/dnsmasq.h b/src/util/virdnsmasq.h
similarity index 100%
rename from src/util/dnsmasq.h
rename to src/util/virdnsmasq.h
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 07/28] Rename ebtables.{c, h} to virebtables.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
src/Makefile.am | 2 +-
src/qemu/qemu_bridge_filter.c | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/util/{ebtables.c => virebtables.c} | 2 +-
src/util/{ebtables.h => virebtables.h} | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename src/util/{ebtables.c => virebtables.c} (99%)
rename src/util/{ebtables.h => virebtables.h} (100%)
diff --git a/src/Makefile.am b/src/Makefile.am
index efb23c1..498fe2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,6 @@ UTIL_SOURCES = \
util/event_poll.c util/event_poll.h \
util/hooks.c util/hooks.h \
util/iptables.c util/iptables.h \
- util/ebtables.c util/ebtables.h \
util/json.c util/json.h \
util/logging.c util/logging.h \
util/memory.c util/memory.h \
@@ -84,6 +83,7 @@ UTIL_SOURCES = \
util/vircommand.c util/vircommand.h \
util/virconf.c util/virconf.h \
util/virdnsmasq.c util/virdnsmasq.h \
+ util/virebtables.c util/virebtables.h \
util/virfile.c util/virfile.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virobject.c util/virobject.h \
diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index a34a92e..a6d0d4f 100644
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -22,7 +22,7 @@
#include <config.h>
-#include "ebtables.h"
+#include "virebtables.h"
#include "qemu_conf.h"
#include "qemu_driver.h"
#include "util.h"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index eafaf9f..5499203 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -26,7 +26,7 @@
# include <config.h>
-# include "ebtables.h"
+# include "virebtables.h"
# include "internal.h"
# include "capabilities.h"
# include "network_conf.h"
diff --git a/src/util/ebtables.c b/src/util/virebtables.c
similarity index 99%
rename from src/util/ebtables.c
rename to src/util/virebtables.c
index 4b427ee..8474b2a 100644
--- a/src/util/ebtables.c
+++ b/src/util/virebtables.c
@@ -40,7 +40,7 @@
#endif
#include "internal.h"
-#include "ebtables.h"
+#include "virebtables.h"
#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
diff --git a/src/util/ebtables.h b/src/util/virebtables.h
similarity index 100%
rename from src/util/ebtables.h
rename to src/util/virebtables.h
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 08/28] Rename event.{c,h} to virevent.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Since the event APIs are now in the public header, no internal
code should include virevent.h
---
src/Makefile.am | 2 +-
src/rpc/virnetclientstream.c | 1 -
src/rpc/virnetserver.c | 1 -
src/rpc/virnetservermdns.c | 1 -
src/rpc/virnetsocket.c | 1 -
src/util/{event.c => virevent.c} | 2 +-
src/util/{event.h => virevent.h} | 0
tests/eventtest.c | 1 -
8 files changed, 2 insertions(+), 7 deletions(-)
rename src/util/{event.c => virevent.c} (99%)
rename src/util/{event.h => virevent.h} (100%)
diff --git a/src/Makefile.am b/src/Makefile.am
index 498fe2d..dadc7d0 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.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 4ed40ca..0e7e38e 100644
--- 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 6a5a53a..f686a8f 100644
--- 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 b55d403..0ddb9d8 100644
--- 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 70c621f..5a2eab3 100644
--- 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 99%
rename from src/util/event.c
rename to src/util/virevent.c
index 0abc30b..08b7006 100644
--- a/src/util/event.c
+++ b/src/util/virevent.c
@@ -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 100%
rename from src/util/event.h
rename to src/util/virevent.h
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 78f51b7..c087978 100644
--- 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
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 09/28] Rename event_poll.{c, h} to vireventpoll.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
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
5:55 a.m.
New subject: [libvirt] [PATCH v2 10/28] Rename hooks.{c,h} to virhook.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
daemon/libvirtd.c | 2 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/lxc/lxc_driver.c | 2 +-
src/lxc/lxc_process.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_migration.c | 2 +-
src/qemu/qemu_process.c | 2 +-
src/util/{hooks.c => virhook.c} | 2 +-
src/util/{hooks.h => virhook.h} | 0
10 files changed, 9 insertions(+), 9 deletions(-)
rename src/util/{hooks.c => virhook.c} (99%)
rename src/util/{hooks.h => virhook.h} (100%)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 9b0e45a..2a2897a 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -53,7 +53,7 @@
#include "threads.h"
#include "remote.h"
#include "remote_driver.h"
-#include "hooks.h"
+#include "virhook.h"
#include "uuid.h"
#include "viraudit.h"
#include "locking/lock_manager.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e1fcb1b..be3f5d8 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/hooks.c
src/util/hostusb.c
src/util/iohelper.c
src/util/iptables.c
@@ -161,6 +160,7 @@ src/util/virdnsmasq.c
src/util/vireventpoll.c
src/util/virfile.c
src/util/virhash.c
+src/util/virhook.c
src/util/virinitctl.c
src/util/virkeyfile.c
src/util/virlockspace.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 0505d69..5df6fff 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/hooks.c util/hooks.h \
util/iptables.c util/iptables.h \
util/json.c util/json.h \
util/logging.c util/logging.h \
@@ -85,6 +84,7 @@ UTIL_SOURCES = \
util/virevent.c util/virevent.h \
util/vireventpoll.c util/vireventpoll.h \
util/virfile.c util/virfile.h \
+ util/virhook.c util/virhook.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/virobject.c util/virobject.h \
util/virpidfile.c util/virpidfile.h \
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 67d6bdb..6f29768 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -52,7 +52,7 @@
#include "nodeinfo.h"
#include "uuid.h"
#include "stats_linux.h"
-#include "hooks.h"
+#include "virhook.h"
#include "virfile.h"
#include "virpidfile.h"
#include "fdstream.h"
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index e5f1ce2..fa53217 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -43,8 +43,8 @@
#include "virterror_internal.h"
#include "logging.h"
#include "vircommand.h"
-#include "hooks.h"
#include "lxc_hostdev.h"
+#include "virhook.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8c1fa60..a499cb5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -79,7 +79,7 @@
#include "cpu/cpu.h"
#include "sysinfo.h"
#include "domain_nwfilter.h"
-#include "hooks.h"
+#include "virhook.h"
#include "storage_file.h"
#include "virfile.h"
#include "fdstream.h"
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 5dcbb07..d7cdcaf 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -49,7 +49,7 @@
#include "rpc/virnetsocket.h"
#include "storage_file.h"
#include "viruri.h"
-#include "hooks.h"
+#include "virhook.h"
#define VIR_FROM_THIS VIR_FROM_QEMU
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 030e000..ef88ba2 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -54,7 +54,7 @@
#include "logging.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "hooks.h"
+#include "virhook.h"
#include "virfile.h"
#include "virpidfile.h"
#include "util.h"
diff --git a/src/util/hooks.c b/src/util/virhook.c
similarity index 99%
rename from src/util/hooks.c
rename to src/util/virhook.c
index a6c056d..0e83f0b 100644
--- a/src/util/hooks.c
+++ b/src/util/virhook.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include "virterror_internal.h"
-#include "hooks.h"
+#include "virhook.h"
#include "util.h"
#include "logging.h"
#include "memory.h"
diff --git a/src/util/hooks.h b/src/util/virhook.h
similarity index 100%
rename from src/util/hooks.h
rename to src/util/virhook.h
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 11/28] Rename hostusb.{c,h} to virusb.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/lxc/lxc_cgroup.h | 2 +-
src/lxc/lxc_conf.h | 2 +-
src/lxc/lxc_container.c | 2 +-
src/qemu/qemu_cgroup.h | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hostdev.c | 2 +-
src/security/security_apparmor.c | 2 +-
src/security/security_dac.c | 2 +-
src/security/security_selinux.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/util/{hostusb.c => virusb.c} | 2 +-
src/util/{hostusb.h => virusb.h} | 0
15 files changed, 14 insertions(+), 14 deletions(-)
rename src/util/{hostusb.c => virusb.c} (99%)
rename src/util/{hostusb.h => virusb.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index be3f5d8..cc595b1 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/hostusb.c
src/util/iohelper.c
src/util/iptables.c
src/util/json.c
@@ -182,6 +181,7 @@ src/util/virterror_internal.h
src/util/virtime.c
src/util/virtypedparam.c
src/util/viruri.c
+src/util/virusb.c
src/util/xml.c
src/vbox/vbox_MSCOMGlue.c
src/vbox/vbox_XPCOMCGlue.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 5df6fff..3229987 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,6 @@ UTIL_SOURCES = \
util/memory.c util/memory.h \
util/pci.c util/pci.h \
util/processinfo.c util/processinfo.h \
- util/hostusb.c util/hostusb.h \
util/sexpr.c util/sexpr.h \
util/stats_linux.c util/stats_linux.h \
util/storage_file.c util/storage_file.h \
@@ -116,6 +115,7 @@ UTIL_SOURCES = \
util/virsocketaddr.h util/virsocketaddr.c \
util/virstring.h util/virstring.c \
util/virtime.h util/virtime.c \
+ util/virusb.c util/virusb.h \
util/viruri.h util/viruri.c
EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h
index c1d4551..97b94e5 100644
--- a/src/lxc/lxc_cgroup.h
+++ b/src/lxc/lxc_cgroup.h
@@ -24,7 +24,7 @@
# include "domain_conf.h"
# include "lxc_fuse.h"
-# include "hostusb.h"
+# include "virusb.h"
int virLXCCgroupSetup(virDomainDefPtr def);
int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo);
diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h
index a9c337e..70d47a4 100644
--- a/src/lxc/lxc_conf.h
+++ b/src/lxc/lxc_conf.h
@@ -35,7 +35,7 @@
# include "vircgroup.h"
# include "security/security_manager.h"
# include "configmake.h"
-# include "hostusb.h"
+# include "virusb.h"
# define LXC_DRIVER_NAME "LXC"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 0c4e676..717811f 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -61,7 +61,7 @@
#include "virnetdevveth.h"
#include "uuid.h"
#include "virfile.h"
-#include "hostusb.h"
+#include "virusb.h"
#include "vircommand.h"
#include "virnetdev.h"
#include "virprocess.h"
diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
index e212581..75ef514 100644
--- a/src/qemu/qemu_cgroup.h
+++ b/src/qemu/qemu_cgroup.h
@@ -24,7 +24,7 @@
#ifndef __QEMU_CGROUP_H__
# define __QEMU_CGROUP_H__
-# include "hostusb.h"
+# include "virusb.h"
# include "domain_conf.h"
# include "qemu_conf.h"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 5499203..283251a 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -36,7 +36,7 @@
# include "security/security_manager.h"
# include "vircgroup.h"
# include "pci.h"
-# include "hostusb.h"
+# include "virusb.h"
# include "cpu_conf.h"
# include "driver.h"
# include "virbitmap.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a499cb5..477c208 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -72,7 +72,7 @@
#include "domain_audit.h"
#include "node_device_conf.h"
#include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
#include "processinfo.h"
#include "libvirt_internal.h"
#include "xml.h"
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 57c5a71..08094d1 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -28,7 +28,7 @@
#include "virterror_internal.h"
#include "memory.h"
#include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
#include "virnetdev.h"
#define VIR_FROM_THIS VIR_FROM_QEMU
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index fff1bdc..2b3a2e2 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -44,7 +44,7 @@
#include "datatypes.h"
#include "uuid.h"
#include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
#include "virfile.h"
#include "configmake.h"
#include "vircommand.h"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 2861725..8ad61d7 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -29,7 +29,7 @@
#include "memory.h"
#include "logging.h"
#include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
#include "storage_file.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 4456a20..8ac6473 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -38,7 +38,7 @@
#include "memory.h"
#include "logging.h"
#include "pci.h"
-#include "hostusb.h"
+#include "virusb.h"
#include "storage_file.h"
#include "virfile.h"
#include "virhash.h"
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 03ce4fe..8553e87 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -50,7 +50,7 @@
#include "domain_conf.h"
#include "xml.h"
#include "uuid.h"
-#include "hostusb.h"
+#include "virusb.h"
#include "pci.h"
#include "virfile.h"
#include "configmake.h"
diff --git a/src/util/hostusb.c b/src/util/virusb.c
similarity index 99%
rename from src/util/hostusb.c
rename to src/util/virusb.c
index 2eb80a0..ef7aff3 100644
--- a/src/util/hostusb.c
+++ b/src/util/virusb.c
@@ -31,7 +31,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "hostusb.h"
+#include "virusb.h"
#include "logging.h"
#include "memory.h"
#include "util.h"
diff --git a/src/util/hostusb.h b/src/util/virusb.h
similarity index 100%
rename from src/util/hostusb.h
rename to src/util/virusb.h
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 12/28] Rename iptables.{c, h} to viriptables.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/network/bridge_driver.c | 2 +-
src/util/{iptables.c => viriptables.c} | 2 +-
src/util/{iptables.h => viriptables.h} | 0
5 files changed, 4 insertions(+), 4 deletions(-)
rename src/util/{iptables.c => viriptables.c} (99%)
rename src/util/{iptables.h => viriptables.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cc595b1..7d16d44 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/iptables.c
src/util/json.c
src/util/pci.c
src/util/processinfo.c
@@ -161,6 +160,7 @@ src/util/virfile.c
src/util/virhash.c
src/util/virhook.c
src/util/virinitctl.c
+src/util/viriptables.c
src/util/virkeyfile.c
src/util/virlockspace.c
src/util/virnetdev.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 3229987..d8f20f0 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/iptables.c util/iptables.h \
util/json.c util/json.h \
util/logging.c util/logging.h \
util/memory.c util/memory.h \
@@ -85,6 +84,7 @@ UTIL_SOURCES = \
util/virfile.c util/virfile.h \
util/virhook.c util/virhook.h \
util/virnodesuspend.c util/virnodesuspend.h \
+ util/viriptables.c util/viriptables.h \
util/virobject.c util/virobject.h \
util/virpidfile.c util/virpidfile.h \
util/virprocess.c util/virprocess.h \
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 7bb6b2a..fdac712 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -56,7 +56,7 @@
#include "vircommand.h"
#include "memory.h"
#include "uuid.h"
-#include "iptables.h"
+#include "viriptables.h"
#include "logging.h"
#include "virdnsmasq.h"
#include "configmake.h"
diff --git a/src/util/iptables.c b/src/util/viriptables.c
similarity index 99%
rename from src/util/iptables.c
rename to src/util/viriptables.c
index 25253ff..8831920 100644
--- a/src/util/iptables.c
+++ b/src/util/viriptables.c
@@ -38,7 +38,7 @@
#endif
#include "internal.h"
-#include "iptables.h"
+#include "viriptables.h"
#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
diff --git a/src/util/iptables.h b/src/util/viriptables.h
similarity index 100%
rename from src/util/iptables.h
rename to src/util/viriptables.h
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 13/28] Rename json.{c,h} to virjson.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/parallels/parallels_utils.c | 2 +-
src/parallels/parallels_utils.h | 2 +-
src/qemu/qemu_agent.c | 2 +-
src/qemu/qemu_monitor.h | 2 +-
src/qemu/qemu_monitor_json.c | 2 +-
src/rpc/virnetserver.h | 2 +-
src/rpc/virnetserverclient.h | 2 +-
src/rpc/virnetsocket.h | 2 +-
src/util/{json.c => virjson.c} | 2 +-
src/util/{json.h => virjson.h} | 0
src/util/virlockspace.h | 2 +-
tests/jsontest.c | 2 +-
tools/virsh-host.c | 2 +-
15 files changed, 14 insertions(+), 14 deletions(-)
rename src/util/{json.c => virjson.c} (99%)
rename src/util/{json.h => virjson.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d16d44..e39a4ef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/json.c
src/util/pci.c
src/util/processinfo.c
src/util/sexpr.c
@@ -161,6 +160,7 @@ src/util/virhash.c
src/util/virhook.c
src/util/virinitctl.c
src/util/viriptables.c
+src/util/virjson.c
src/util/virkeyfile.c
src/util/virlockspace.c
src/util/virnetdev.c
diff --git a/src/Makefile.am b/src/Makefile.am
index d8f20f0..d0c391e 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/json.c util/json.h \
util/logging.c util/logging.h \
util/memory.c util/memory.h \
util/pci.c util/pci.h \
@@ -85,6 +84,7 @@ UTIL_SOURCES = \
util/virhook.c util/virhook.h \
util/virnodesuspend.c util/virnodesuspend.h \
util/viriptables.c util/viriptables.h \
+ util/virjson.c util/virjson.h \
util/virobject.c util/virobject.h \
util/virpidfile.c util/virpidfile.h \
util/virprocess.c util/virprocess.h \
diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index e47ff76..b032882 100644
--- a/src/parallels/parallels_utils.c
+++ b/src/parallels/parallels_utils.c
@@ -27,7 +27,7 @@
#include "vircommand.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "json.h"
+#include "virjson.h"
#include "parallels_utils.h"
diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h
index 0010f85..7c31707 100644
--- a/src/parallels/parallels_utils.h
+++ b/src/parallels/parallels_utils.h
@@ -29,7 +29,7 @@
# include "conf/storage_conf.h"
# include "conf/domain_event.h"
# include "conf/network_conf.h"
-# include "json.h"
+# include "virjson.h"
# define parallelsParseError() \
virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 893f7f2..6727294 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -37,7 +37,7 @@
#include "memory.h"
#include "logging.h"
#include "virterror_internal.h"
-#include "json.h"
+#include "virjson.h"
#include "virfile.h"
#include "virprocess.h"
#include "virtime.h"
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 8c42b12..d7faa90 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -30,7 +30,7 @@
# include "domain_conf.h"
# include "virbitmap.h"
# include "virhash.h"
-# include "json.h"
+# include "virjson.h"
# include "device_conf.h"
typedef struct _qemuMonitor qemuMonitor;
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0cd66b6..6181668 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -40,7 +40,7 @@
#include "driver.h"
#include "datatypes.h"
#include "virterror_internal.h"
-#include "json.h"
+#include "virjson.h"
#ifdef WITH_DTRACE_PROBES
# include "libvirt_qemu_probes.h"
diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
index 38cccfe..da7dc9e 100644
--- a/src/rpc/virnetserver.h
+++ b/src/rpc/virnetserver.h
@@ -31,7 +31,7 @@
# include "virnetserverclient.h"
# include "virnetserverservice.h"
# include "virobject.h"
-# include "json.h"
+# include "virjson.h"
virNetServerPtr virNetServerNew(size_t min_workers,
size_t max_workers,
diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index 041ffde..65084e2 100644
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -27,7 +27,7 @@
# include "virnetsocket.h"
# include "virnetmessage.h"
# include "virobject.h"
-# include "json.h"
+# include "virjson.h"
typedef struct _virNetServerClient virNetServerClient;
typedef virNetServerClient *virNetServerClientPtr;
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index fcd54dd..7016c09 100644
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -31,7 +31,7 @@
# ifdef HAVE_SASL
# include "virnetsaslcontext.h"
# endif
-# include "json.h"
+# include "virjson.h"
typedef struct _virNetSocket virNetSocket;
typedef virNetSocket *virNetSocketPtr;
diff --git a/src/util/json.c b/src/util/virjson.c
similarity index 99%
rename from src/util/json.c
rename to src/util/virjson.c
index 41e0311..a07dd5c 100644
--- a/src/util/json.c
+++ b/src/util/virjson.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "json.h"
+#include "virjson.h"
#include "memory.h"
#include "virterror_internal.h"
#include "logging.h"
diff --git a/src/util/json.h b/src/util/virjson.h
similarity index 100%
rename from src/util/json.h
rename to src/util/virjson.h
diff --git a/src/util/virlockspace.h b/src/util/virlockspace.h
index 9c5128b..041cf20 100644
--- a/src/util/virlockspace.h
+++ b/src/util/virlockspace.h
@@ -23,7 +23,7 @@
# define __VIR_LOCK_SPACE_H__
# include "internal.h"
-# include "json.h"
+# include "virjson.h"
typedef struct _virLockSpace virLockSpace;
typedef virLockSpace *virLockSpacePtr;
diff --git a/tests/jsontest.c b/tests/jsontest.c
index 412f475..98a6069 100644
--- a/tests/jsontest.c
+++ b/tests/jsontest.c
@@ -6,7 +6,7 @@
#include <time.h>
#include "internal.h"
-#include "json.h"
+#include "virjson.h"
#include "testutils.h"
struct testInfo {
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index f687780..6f129d1 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -38,7 +38,7 @@
#include "virsh-domain.h"
#include "xml.h"
#include "virtypedparam.h"
-#include "json.h"
+#include "virjson.h"
/*
* "capabilities" command
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 14/28] Rename logging.{c,h} to virlog.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
daemon/libvirtd-config.c | 2 +-
daemon/libvirtd.h | 2 +-
daemon/remote.c | 2 +-
daemon/stream.c | 2 +-
src/Makefile.am | 2 +-
src/conf/domain_audit.c | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/domain_event.c | 2 +-
src/conf/nwfilter_params.c | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/virconsole.c | 2 +-
src/cpu/cpu.c | 2 +-
src/cpu/cpu_powerpc.c | 2 +-
src/cpu/cpu_x86.c | 2 +-
src/datatypes.c | 2 +-
src/driver.c | 2 +-
src/esx/esx_device_monitor.c | 2 +-
src/esx/esx_driver.c | 2 +-
src/esx/esx_interface_driver.c | 2 +-
src/esx/esx_network_driver.c | 2 +-
src/esx/esx_nwfilter_driver.c | 2 +-
src/esx/esx_secret_driver.c | 2 +-
src/esx/esx_storage_backend_iscsi.c | 2 +-
src/esx/esx_storage_backend_vmfs.c | 2 +-
src/esx/esx_util.c | 2 +-
src/esx/esx_vi.c | 2 +-
src/esx/esx_vi_methods.c | 2 +-
src/esx/esx_vi_types.c | 2 +-
src/fdstream.c | 2 +-
src/hyperv/hyperv_device_monitor.c | 2 +-
src/hyperv/hyperv_driver.c | 2 +-
src/hyperv/hyperv_interface_driver.c | 2 +-
src/hyperv/hyperv_network_driver.c | 2 +-
src/hyperv/hyperv_nwfilter_driver.c | 2 +-
src/hyperv/hyperv_secret_driver.c | 2 +-
src/hyperv/hyperv_storage_driver.c | 2 +-
src/hyperv/hyperv_util.c | 2 +-
src/hyperv/hyperv_wmi.c | 2 +-
src/interface/interface_backend_netcf.c | 2 +-
src/libvirt-qemu.c | 2 +-
src/libvirt.c | 2 +-
src/libxl/libxl_conf.c | 2 +-
src/libxl/libxl_driver.c | 2 +-
src/locking/domain_lock.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/locking/lock_daemon_config.c | 2 +-
src/locking/lock_daemon_dispatch.c | 2 +-
src/locking/lock_driver_lockd.c | 2 +-
src/locking/lock_driver_nop.c | 2 +-
src/locking/lock_driver_sanlock.c | 2 +-
src/locking/lock_manager.c | 2 +-
src/lxc/lxc_cgroup.c | 2 +-
src/lxc/lxc_conf.c | 2 +-
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/lxc/lxc_domain.c | 2 +-
src/lxc/lxc_driver.c | 2 +-
src/lxc/lxc_fuse.c | 2 +-
src/lxc/lxc_hostdev.c | 2 +-
src/lxc/lxc_monitor.c | 2 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/node_device/node_device_driver.c | 2 +-
src/node_device/node_device_hal.c | 2 +-
src/node_device/node_device_linux_sysfs.c | 2 +-
src/node_device/node_device_udev.c | 2 +-
src/nodeinfo.c | 2 +-
src/nwfilter/nwfilter_dhcpsnoop.c | 2 +-
src/nwfilter/nwfilter_driver.c | 2 +-
src/nwfilter/nwfilter_ebiptables_driver.c | 2 +-
src/nwfilter/nwfilter_gentech_driver.c | 2 +-
src/nwfilter/nwfilter_learnipaddr.c | 2 +-
src/openvz/openvz_driver.c | 2 +-
src/parallels/parallels_driver.c | 2 +-
src/phyp/phyp_driver.c | 2 +-
src/qemu/qemu_agent.c | 2 +-
src/qemu/qemu_bridge_filter.c | 2 +-
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_cgroup.c | 2 +-
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hostdev.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_migration.c | 2 +-
src/qemu/qemu_monitor.c | 2 +-
src/qemu/qemu_monitor_json.c | 2 +-
src/qemu/qemu_monitor_text.c | 2 +-
src/qemu/qemu_process.c | 2 +-
src/remote/remote_driver.c | 2 +-
src/rpc/virkeepalive.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetclientprogram.c | 2 +-
src/rpc/virnetclientstream.c | 2 +-
src/rpc/virnetmessage.c | 2 +-
src/rpc/virnetsaslcontext.c | 2 +-
src/rpc/virnetserver.c | 2 +-
src/rpc/virnetserverclient.c | 2 +-
src/rpc/virnetservermdns.c | 2 +-
src/rpc/virnetserverprogram.c | 2 +-
src/rpc/virnetsocket.c | 2 +-
src/rpc/virnetsshsession.c | 2 +-
src/rpc/virnettlscontext.c | 2 +-
src/secret/secret_driver.c | 2 +-
src/security/security_apparmor.c | 2 +-
src/security/security_dac.c | 2 +-
src/security/security_driver.c | 2 +-
src/security/security_manager.c | 2 +-
src/security/security_selinux.c | 2 +-
src/storage/storage_backend.c | 2 +-
src/storage/storage_backend_disk.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/storage/storage_backend_iscsi.c | 2 +-
src/storage/storage_backend_logical.c | 2 +-
src/storage/storage_backend_mpath.c | 2 +-
src/storage/storage_backend_rbd.c | 2 +-
src/storage/storage_backend_scsi.c | 2 +-
src/storage/storage_backend_sheepdog.c | 2 +-
src/storage/storage_driver.c | 2 +-
src/test/test_driver.c | 2 +-
src/uml/uml_conf.c | 2 +-
src/uml/uml_driver.c | 2 +-
src/util/memory.c | 2 +-
src/util/pci.c | 2 +-
src/util/storage_file.c | 2 +-
src/util/sysinfo.c | 2 +-
src/util/util.c | 2 +-
src/util/uuid.c | 2 +-
src/util/virarch.c | 2 +-
src/util/viraudit.c | 2 +-
src/util/virauth.c | 2 +-
src/util/virauthconfig.c | 2 +-
src/util/vircgroup.c | 2 +-
src/util/vircommand.c | 2 +-
src/util/virconf.c | 2 +-
src/util/virdbus.c | 2 +-
src/util/virdnsmasq.c | 2 +-
src/util/virebtables.c | 2 +-
src/util/virevent.c | 2 +-
src/util/vireventpoll.c | 2 +-
src/util/virfile.c | 2 +-
src/util/virhash.c | 2 +-
src/util/virhook.c | 2 +-
src/util/viriptables.c | 2 +-
src/util/virjson.c | 2 +-
src/util/virkeyfile.c | 2 +-
src/util/virlockspace.c | 2 +-
src/util/{logging.c => virlog.c} | 2 +-
src/util/{logging.h => virlog.h} | 0
src/util/virnetdev.c | 2 +-
src/util/virnetdevmacvlan.c | 2 +-
src/util/virnetdevtap.c | 2 +-
src/util/virnetdevveth.c | 2 +-
src/util/virnetdevvportprofile.c | 2 +-
src/util/virnetlink.c | 2 +-
src/util/virnodesuspend.c | 2 +-
src/util/virobject.c | 2 +-
src/util/virpidfile.c | 2 +-
src/util/virprocess.c | 2 +-
src/util/virrandom.c | 2 +-
src/util/virterror.c | 2 +-
src/util/virusb.c | 2 +-
src/vbox/vbox_MSCOMGlue.c | 2 +-
src/vbox/vbox_XPCOMCGlue.c | 2 +-
src/vbox/vbox_driver.c | 2 +-
src/vbox/vbox_tmpl.c | 2 +-
src/vmx/vmx.c | 2 +-
src/xen/xen_driver.c | 2 +-
src/xen/xen_hypervisor.c | 2 +-
src/xen/xen_inotify.c | 2 +-
src/xen/xend_internal.c | 2 +-
src/xen/xm_internal.c | 2 +-
src/xen/xs_internal.c | 2 +-
src/xenapi/xenapi_utils.c | 2 +-
src/xenxs/xen_sxpr.c | 2 +-
tests/eventtest.c | 2 +-
tests/libvirtdconftest.c | 2 +-
tests/qemumonitortestutils.c | 2 +-
tests/securityselinuxtest.c | 2 +-
tests/sockettest.c | 2 +-
tests/testutils.c | 2 +-
tests/virauthconfigtest.c | 2 +-
tests/virdrivermoduletest.c | 2 +-
tests/virhashtest.c | 2 +-
tests/virkeyfiletest.c | 2 +-
tests/virlockspacetest.c | 2 +-
tests/virnetmessagetest.c | 2 +-
tests/virnetsockettest.c | 2 +-
tests/virnettlscontexttest.c | 2 +-
tests/virstringtest.c | 2 +-
tests/virtimetest.c | 2 +-
tests/viruritest.c | 2 +-
tools/console.c | 2 +-
195 files changed, 194 insertions(+), 194 deletions(-)
rename src/util/{logging.c => virlog.c} (99%)
rename src/util/{logging.h => virlog.h} (100%)
diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 0ca185c..f61f08d 100644
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -27,7 +27,7 @@
#include "virconf.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "rpc/virnetserver.h"
#include "configmake.h"
#include "remote/remote_protocol.h"
diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h
index e389151..b04cc71 100644
--- a/daemon/libvirtd.h
+++ b/daemon/libvirtd.h
@@ -33,7 +33,7 @@
# include <rpc/xdr.h>
# include "remote_protocol.h"
# include "qemu_protocol.h"
-# include "logging.h"
+# include "virlog.h"
# include "threads.h"
# if HAVE_SASL
# include "virnetsaslcontext.h"
diff --git a/daemon/remote.c b/daemon/remote.c
index 3cee038..bb38689 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -34,7 +34,7 @@
#include "libvirt_internal.h"
#include "datatypes.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "stream.h"
#include "uuid.h"
diff --git a/daemon/stream.c b/daemon/stream.c
index fa14eeb..d63e009 100644
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -26,7 +26,7 @@
#include "stream.h"
#include "remote.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virnetserverclient.h"
#include "virterror_internal.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index d0c391e..59958c6 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/logging.c util/logging.h \
util/memory.c util/memory.h \
util/pci.c util/pci.h \
util/processinfo.c util/processinfo.h \
@@ -85,6 +84,7 @@ UTIL_SOURCES = \
util/virnodesuspend.c util/virnodesuspend.h \
util/viriptables.c util/viriptables.h \
util/virjson.c util/virjson.h \
+ util/virlog.c util/virlog.h \
util/virobject.c util/virobject.h \
util/virpidfile.c util/virpidfile.h \
util/virprocess.c util/virprocess.h \
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index 97b3aa4..a73c723 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -29,7 +29,7 @@
#include "domain_audit.h"
#include "viraudit.h"
#include "uuid.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
/* Return nn:mm in hex for block and character devices, and NULL
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a5cd0e7..2c92de6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -40,7 +40,7 @@
#include "uuid.h"
#include "util.h"
#include "virbuffer.h"
-#include "logging.h"
+#include "virlog.h"
#include "nwfilter_conf.h"
#include "storage_file.h"
#include "virfile.h"
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index cf37308..f1e247b 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "domain_event.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "memory.h"
#include "virterror_internal.h"
diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 7254519..f8cf980 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -30,7 +30,7 @@
#include "datatypes.h"
#include "nwfilter_params.h"
#include "domain_conf.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_NWFILTER
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index ec67f57..24d7aa0 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -25,7 +25,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "secret_conf.h"
#include "virterror_internal.h"
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 38a3e2a..6361810 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -34,7 +34,7 @@
#include "count-one-bits.h"
#include "datatypes.h"
#include "domain_conf.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "netdev_bandwidth_conf.h"
#include "netdev_vport_profile_conf.h"
diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c
index 143c1a6..92179cc 100644
--- a/src/conf/virconsole.c
+++ b/src/conf/virconsole.c
@@ -34,7 +34,7 @@
#include "threads.h"
#include "memory.h"
#include "virpidfile.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "virfile.h"
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 53c4cc3..be1f4ce 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "xml.h"
#include "cpu.h"
diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index 36d601e..26991d8 100644
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -26,7 +26,7 @@
#include <config.h>
#include <stdint.h>
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "util.h"
#include "cpu.h"
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 1447141..2970573 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -25,7 +25,7 @@
#include <stdint.h>
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "util.h"
#include "cpu.h"
diff --git a/src/datatypes.c b/src/datatypes.c
index c0ed3a2..73a2fd0 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -24,7 +24,7 @@
#include "datatypes.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "uuid.h"
#include "util.h"
diff --git a/src/driver.c b/src/driver.c
index 6d2feb9..4ef6fd2 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -26,7 +26,7 @@
#include "driver.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "configmake.h"
diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index c3f9339..0ad95f5 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -27,7 +27,7 @@
#include "internal.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "esx_private.h"
#include "esx_device_monitor.h"
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 4171beb..488d18d 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -30,7 +30,7 @@
#include "virauth.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "vmx.h"
#include "virtypedparam.h"
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index 35bc7fa..4760264 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -27,7 +27,7 @@
#include "internal.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "interface_conf.h"
#include "virsocketaddr.h"
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 6a87abd..3e25aa2 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "network_conf.h"
#include "esx_private.h"
diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index 9780ca6..f5e710d 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -27,7 +27,7 @@
#include "internal.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "esx_private.h"
#include "esx_nwfilter_driver.h"
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 55b2e9a..2a98644 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "esx_private.h"
#include "esx_secret_driver.h"
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index b6cde96..5d4eb3c 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -30,7 +30,7 @@
#include "md5.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "storage_conf.h"
#include "storage_file.h"
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index 5ef2981..c8bba9e 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -33,7 +33,7 @@
#include "md5.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "storage_conf.h"
#include "storage_file.h"
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index b807607..6e27fe4 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -30,7 +30,7 @@
#include "datatypes.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "vmx.h"
#include "esx_private.h"
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index d645bfb..76192df 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -28,7 +28,7 @@
#include "virbuffer.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "uuid.h"
#include "vmx.h"
diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index a3c3c8b..a3870ee 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -25,7 +25,7 @@
#include "virbuffer.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "esx_vi_methods.h"
#include "esx_util.h"
diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index 1654e1b..d0a2c6c 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -30,7 +30,7 @@
#include "virbuffer.h"
#include "datatypes.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "esx_vi.h"
#include "esx_vi_types.h"
diff --git a/src/fdstream.c b/src/fdstream.c
index d1eb04c..fdbd7a2 100644
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -35,7 +35,7 @@
#include "fdstream.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "util.h"
#include "virfile.h"
diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index e183798..1fa98b2 100644
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -28,7 +28,7 @@
#include "datatypes.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "hyperv_device_monitor.h"
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 4aed41f..95b0cd9 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -29,7 +29,7 @@
#include "virauth.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "hyperv_driver.h"
#include "hyperv_interface_driver.h"
diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 9b1bb37..6a3c2cb 100644
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -28,7 +28,7 @@
#include "datatypes.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "hyperv_interface_driver.h"
diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index 3a61fe6..2f9fcab 100644
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -28,7 +28,7 @@
#include "datatypes.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "hyperv_network_driver.h"
diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index 9d54f82..c490522 100644
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -28,7 +28,7 @@
#include "datatypes.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "hyperv_nwfilter_driver.h"
diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index 7ee8ce9..3d58b01 100644
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -28,7 +28,7 @@
#include "datatypes.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "hyperv_secret_driver.h"
diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 2e03162..7fbc14d 100644
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -28,7 +28,7 @@
#include "datatypes.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "hyperv_storage_driver.h"
diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 3050d61..1ef6dae 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -26,7 +26,7 @@
#include "datatypes.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "hyperv_private.h"
#include "hyperv_util.h"
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 0a6b107..069ebe6 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -27,7 +27,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "util.h"
#include "uuid.h"
diff --git a/src/interface/interface_backend_netcf.c
b/src/interface/interface_backend_netcf.c
index 226e020..1f42920 100644
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -30,7 +30,7 @@
#include "interface_driver.h"
#include "interface_conf.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_INTERFACE
diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c
index cc98bbb..8d53b5c 100644
--- a/src/libvirt-qemu.c
+++ b/src/libvirt-qemu.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "libvirt/libvirt-qemu.h"
diff --git a/src/libvirt.c b/src/libvirt.c
index 8f7a869..d078304 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -46,7 +46,7 @@
#endif
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "driver.h"
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 5f02b95..0ccab50 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -31,7 +31,7 @@
#include <sys/socket.h>
#include "internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "datatypes.h"
#include "virfile.h"
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 77457c8..b7e6630 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include "internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "virconf.h"
#include "datatypes.h"
diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 1e3da5f..00861cf 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -25,7 +25,7 @@
#include "memory.h"
#include "uuid.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_LOCKING
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 08caa16..3c2a50c 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -38,7 +38,7 @@
#include "virpidfile.h"
#include "virprocess.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "virconf.h"
#include "rpc/virnetserver.h"
diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index c2d9a76..9557b8c 100644
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -27,7 +27,7 @@
#include "virconf.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "rpc/virnetserver.h"
#include "configmake.h"
diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index bb4dcfa..78c9726 100644
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -25,7 +25,7 @@
#include "rpc/virnetserver.h"
#include "rpc/virnetserverclient.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "lock_daemon.h"
#include "lock_protocol.h"
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index c88c5af..d5d721d 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -24,7 +24,7 @@
#include "lock_driver.h"
#include "virconf.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "util.h"
#include "virfile.h"
diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c
index c9ab806..745a0bf 100644
--- a/src/locking/lock_driver_nop.c
+++ b/src/locking/lock_driver_nop.c
@@ -23,7 +23,7 @@
#include "lock_driver_nop.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 2eadc07..1e8df26 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -37,7 +37,7 @@
#include "dirname.h"
#include "lock_driver.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "memory.h"
#include "util.h"
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index e6d9308..f038d4e 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -24,7 +24,7 @@
#include "lock_manager.h"
#include "lock_driver_nop.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "memory.h"
#include "uuid.h"
diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 5f092de..d023b84 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -25,7 +25,7 @@
#include "lxc_container.h"
#include "virfile.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "vircgroup.h"
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 905734b..a5ba2f7 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -31,7 +31,7 @@
#include "virterror_internal.h"
#include "virconf.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "configmake.h"
#include "lxc_container.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 717811f..760d3af 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -54,7 +54,7 @@
#endif
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "lxc_container.h"
#include "util.h"
#include "memory.h"
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index bfe2126..f0e08e3 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -52,7 +52,7 @@
#endif
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "lxc_conf.h"
diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index bd80d9f..77a64dd 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -24,7 +24,7 @@
#include "lxc_domain.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 6f29768..8265328 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -37,7 +37,7 @@
#include <wait.h>
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "lxc_cgroup.h"
#include "lxc_conf.h"
diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 4e7df55..485456e 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -32,7 +32,7 @@
#include "lxc_fuse.h"
#include "lxc_cgroup.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "virbuffer.h"
diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index c063aa0..aa450ec 100644
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "lxc_hostdev.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "memory.h"
diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 4d177c9..9eb587d 100644
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -28,7 +28,7 @@
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "threads.h"
#include "rpc/virnetclient.h"
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index fa53217..762a23d 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -41,7 +41,7 @@
#include "memory.h"
#include "domain_audit.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "vircommand.h"
#include "lxc_hostdev.h"
#include "virhook.h"
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index fdac712..e336503 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -57,7 +57,7 @@
#include "memory.h"
#include "uuid.h"
#include "viriptables.h"
-#include "logging.h"
+#include "virlog.h"
#include "virdnsmasq.h"
#include "configmake.h"
#include "virnetdev.h"
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 4d3e01b..48360e3 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -33,7 +33,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "node_device_conf.h"
#include "node_device_hal.h"
#include "node_device_driver.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 080aaed..59ba5c3 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -36,7 +36,7 @@
#include "memory.h"
#include "uuid.h"
#include "pci.h"
-#include "logging.h"
+#include "virlog.h"
#include "node_device_driver.h"
#include "virdbus.h"
diff --git a/src/node_device/node_device_linux_sysfs.c
b/src/node_device/node_device_linux_sysfs.c
index 3048e33..fbe0da5 100644
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -30,7 +30,7 @@
#include "node_device_hal.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_NODEDEV
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index b3499fb..fef00ad 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -32,7 +32,7 @@
#include "node_device_driver.h"
#include "driver.h"
#include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "uuid.h"
#include "util.h"
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 89322a4..1e68019 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -43,7 +43,7 @@
#include "nodeinfo.h"
#include "physmem.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "count-one-bits.h"
#include "intprops.h"
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index e4c895f..68aa233 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -55,7 +55,7 @@
#include <net/if.h>
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "virterror_internal.h"
#include "conf/domain_conf.h"
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 3aa026a..7fde656 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -28,7 +28,7 @@
#include <config.h>
#include "virdbus.h"
-#include "logging.h"
+#include "virlog.h"
#include "internal.h"
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c
b/src/nwfilter/nwfilter_ebiptables_driver.c
index 6966acf..23a43d2 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -32,7 +32,7 @@
#include "virbuffer.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "domain_conf.h"
#include "nwfilter_conf.h"
diff --git a/src/nwfilter/nwfilter_gentech_driver.c
b/src/nwfilter/nwfilter_gentech_driver.c
index 572acf4..6be4a93 100644
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -27,7 +27,7 @@
#include "internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "domain_conf.h"
#include "virterror_internal.h"
#include "nwfilter_gentech_driver.h"
diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 361bdce..110eae8 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -43,7 +43,7 @@
#include "intprops.h"
#include "virbuffer.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "virnetdev.h"
#include "virterror_internal.h"
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 9297777..e51bf29 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -55,7 +55,7 @@
#include "memory.h"
#include "virfile.h"
#include "virtypedparam.h"
-#include "logging.h"
+#include "virlog.h"
#include "vircommand.h"
#include "viruri.h"
#include "stats_linux.h"
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 6414913..cc65117 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -44,7 +44,7 @@
#include "virterror_internal.h"
#include "memory.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "vircommand.h"
#include "configmake.h"
#include "storage_file.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index e81bc09..f1d994c 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -48,7 +48,7 @@
#include "datatypes.h"
#include "virbuffer.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "driver.h"
#include "libvirt/libvirt.h"
#include "virterror_internal.h"
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 6727294..421e43f 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -35,7 +35,7 @@
#include "qemu_agent.h"
#include "qemu_command.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "virjson.h"
#include "virfile.h"
diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index a6d0d4f..08a9f1a 100644
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -27,7 +27,7 @@
#include "qemu_driver.h"
#include "util.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "qemu_bridge_filter.h"
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 98da9a4..5a80015 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -25,7 +25,7 @@
#include "qemu_capabilities.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "util.h"
#include "virfile.h"
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 445d085..80ceee5 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -27,7 +27,7 @@
#include "qemu_domain.h"
#include "qemu_process.h"
#include "vircgroup.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "virterror_internal.h"
#include "util.h"
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ef16d27..14ab29f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -29,7 +29,7 @@
#include "qemu_bridge_filter.h"
#include "cpu/cpu.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "util.h"
#include "virarch.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 91af49b..2073fd5 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -47,7 +47,7 @@
#include "datatypes.h"
#include "xml.h"
#include "nodeinfo.h"
-#include "logging.h"
+#include "virlog.h"
#include "cpu/cpu.h"
#include "domain_nwfilter.h"
#include "virfile.h"
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8d8cf02..e6eaa58 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -28,7 +28,7 @@
#include "qemu_capabilities.h"
#include "qemu_migration.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "c-ctype.h"
#include "cpu/cpu.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 477c208..4d81a73 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -59,7 +59,7 @@
#include "qemu_migration.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "virbuffer.h"
#include "util.h"
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 08094d1..94b5ae0 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "qemu_hostdev.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "memory.h"
#include "pci.h"
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5aab00b..f8420c4 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -32,7 +32,7 @@
#include "qemu_hostdev.h"
#include "domain_audit.h"
#include "domain_nwfilter.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "virterror_internal.h"
#include "memory.h"
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index d7cdcaf..4248298 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -36,7 +36,7 @@
#include "qemu_cgroup.h"
#include "domain_audit.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "memory.h"
#include "util.h"
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 131e8df..920453d 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -33,7 +33,7 @@
#include "qemu_monitor_json.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "virprocess.h"
#include "virobject.h"
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 6181668..e14134b 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -36,7 +36,7 @@
#include "qemu_command.h"
#include "qemu_capabilities.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "driver.h"
#include "datatypes.h"
#include "virterror_internal.h"
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index a12adb6..28690b1 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -35,7 +35,7 @@
#include "c-ctype.h"
#include "c-strcasestr.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "driver.h"
#include "datatypes.h"
#include "virterror_internal.h"
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ef88ba2..00ff243 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -51,7 +51,7 @@
#endif
#include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "memory.h"
#include "virhook.h"
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 8b77e7d..1e9151a 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -30,7 +30,7 @@
#include "virnetclientprogram.h"
#include "virnetclientstream.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "domain_event.h"
#include "driver.h"
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 309f22f..8fc1cba 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -25,7 +25,7 @@
#include "memory.h"
#include "threads.h"
#include "virfile.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "virterror_internal.h"
#include "virnetsocket.h"
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index bf2547c..7370ae0 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -33,7 +33,7 @@
#include "memory.h"
#include "threads.h"
#include "virfile.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "virterror_internal.h"
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 1f08640..dec3943 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -30,7 +30,7 @@
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "virfile.h"
#include "threads.h"
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 0e7e38e..26dc292 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -26,7 +26,7 @@
#include "virnetclient.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "threads.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index cf76e21..16d8e61 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -26,7 +26,7 @@
#include "virnetmessage.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "util.h"
diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index b6b68d5..e880127 100644
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -28,7 +28,7 @@
#include "virterror_internal.h"
#include "memory.h"
#include "threads.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index f686a8f..6d3532a 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -28,7 +28,7 @@
#include <fcntl.h>
#include "virnetserver.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "virterror_internal.h"
#include "threads.h"
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index ed26719..9642ea5 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -29,7 +29,7 @@
#include "virnetserverclient.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "memory.h"
#include "threads.h"
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index 166b4eb..c17b65d 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -44,7 +44,7 @@
#include "vireventpoll.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index e4aa2da..5b96c34 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -28,7 +28,7 @@
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "threads.h"
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 5a2eab3..aa8f4b9 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -44,7 +44,7 @@
#include "util.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "threads.h"
#include "virprocess.h"
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index d890569..734acaa 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "configmake.h"
#include "threads.h"
#include "util.h"
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 1d32327..2931003 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -33,7 +33,7 @@
#include "memory.h"
#include "virterror_internal.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "threads.h"
#include "configmake.h"
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index d9ba42b..4159358 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -32,7 +32,7 @@
#include "base64.h"
#include "datatypes.h"
#include "driver.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "secret_conf.h"
#include "secret_driver.h"
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 2b3a2e2..9262091 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -48,7 +48,7 @@
#include "virfile.h"
#include "configmake.h"
#include "vircommand.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
#define SECURITY_APPARMOR_VOID_DOI "0"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 8ad61d7..931ae4e 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "pci.h"
#include "virusb.h"
#include "storage_file.h"
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index c7ff8a5..82d3ca9 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -24,7 +24,7 @@
#include <string.h>
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "security_driver.h"
#ifdef WITH_SECDRIVER_SELINUX
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index db94837..c675715 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -28,7 +28,7 @@
#include "security_dac.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 8ac6473..11f839f 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -36,7 +36,7 @@
#include "virterror_internal.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "pci.h"
#include "virusb.h"
#include "storage_file.h"
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 083028d..899caeb 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -54,7 +54,7 @@
#include "uuid.h"
#include "storage_file.h"
#include "storage_backend.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "stat-time.h"
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index c6aa407..7e1d3ec 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "storage_backend_disk.h"
#include "util.h"
#include "memory.h"
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index cdf93af..78b50f0 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -49,7 +49,7 @@
#include "memory.h"
#include "xml.h"
#include "virfile.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index c468b1b..46659af 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -39,7 +39,7 @@
#include "storage_backend_iscsi.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "vircommand.h"
#include "virrandom.h"
diff --git a/src/storage/storage_backend_logical.c
b/src/storage/storage_backend_logical.c
index 53e6c61..f28c663 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -36,7 +36,7 @@
#include "storage_conf.h"
#include "vircommand.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index efcfb28..1ca120f 100644
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -33,7 +33,7 @@
#include "storage_conf.h"
#include "storage_backend.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index bc61cf7..4e58911 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -27,7 +27,7 @@
#include "storage_conf.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "base64.h"
#include "uuid.h"
#include "rados/librados.h"
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 6515e57..32713be 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -31,7 +31,7 @@
#include "virterror_internal.h"
#include "storage_backend_scsi.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "vircommand.h"
diff --git a/src/storage/storage_backend_sheepdog.c
b/src/storage/storage_backend_sheepdog.c
index ecca7a8..05deeeb 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -32,7 +32,7 @@
#include "vircommand.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index c567fff..6076f6c 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -44,7 +44,7 @@
#include "storage_conf.h"
#include "memory.h"
#include "storage_backend.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "fdstream.h"
#include "configmake.h"
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 63066be..8dd5694 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -48,7 +48,7 @@
#include "node_device_conf.h"
#include "xml.h"
#include "threads.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "virtypedparam.h"
#include "virrandom.h"
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index b669b5a..6b14f23 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -41,7 +41,7 @@
#include "util.h"
#include "memory.h"
#include "nodeinfo.h"
-#include "logging.h"
+#include "virlog.h"
#include "domain_nwfilter.h"
#include "virfile.h"
#include "vircommand.h"
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 8dece66..90c9b66 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -56,7 +56,7 @@
#include "domain_conf.h"
#include "domain_audit.h"
#include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
#include "domain_nwfilter.h"
#include "virfile.h"
#include "fdstream.h"
diff --git a/src/util/memory.c b/src/util/memory.c
index b224f30..186d3b6 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#if TEST_OOM
static int testMallocNext = 0;
diff --git a/src/util/pci.c b/src/util/pci.c
index bf46fca..7adce75 100644
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "vircommand.h"
#include "virterror_internal.h"
diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index eebf59a..6c3390b 100644
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -37,7 +37,7 @@
#include "dirname.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "c-ctype.h"
#include "vircommand.h"
diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index 2f5c161..f07c2d8 100644
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -33,7 +33,7 @@
#include "virterror_internal.h"
#include "sysinfo.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "vircommand.h"
diff --git a/src/util/util.c b/src/util/util.c
index f8ba7b4..f941dfd 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -76,7 +76,7 @@
#include "c-ctype.h"
#include "dirname.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virbuffer.h"
#include "util.h"
#include "storage_file.h"
diff --git a/src/util/uuid.c b/src/util/uuid.c
index 5c3b32c..6efc7be 100644
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -37,7 +37,7 @@
#include "internal.h"
#include "util.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "virfile.h"
#include "virrandom.h"
diff --git a/src/util/virarch.c b/src/util/virarch.c
index 1376887..ffd07dc 100644
--- a/src/util/virarch.c
+++ b/src/util/virarch.c
@@ -23,7 +23,7 @@
#include <sys/utsname.h>
-#include "logging.h"
+#include "virlog.h"
#include "virarch.h"
#include "verify.h"
diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index 9bdc5ed..c4e0129 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -28,7 +28,7 @@
#include <unistd.h>
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "viraudit.h"
#include "util.h"
#include "virfile.h"
diff --git a/src/util/virauth.c b/src/util/virauth.c
index 6d9935d..a1bad6a 100644
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -27,7 +27,7 @@
#include "virauth.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "virterror_internal.h"
#include "configmake.h"
diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 49a4466..46ba040 100644
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -27,7 +27,7 @@
#include "virkeyfile.h"
#include "memory.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index e9fc67f..82e6613 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -41,7 +41,7 @@
#include "util.h"
#include "memory.h"
#include "vircgroup.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "virhash.h"
#include "virhashcode.h"
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 3046658..7bed04e 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -37,7 +37,7 @@
#include "memory.h"
#include "virterror_internal.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "virpidfile.h"
#include "virprocess.h"
diff --git a/src/util/virconf.c b/src/util/virconf.c
index 221a1eb..c12a0bb 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -35,7 +35,7 @@
#include "virconf.h"
#include "util.h"
#include "c-ctype.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "virfile.h"
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 2a96778..b6c6642 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -24,7 +24,7 @@
#include "virdbus.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "threads.h"
#define VIR_FROM_THIS VIR_FROM_DBUS
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index b9f72ce..d660c27 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -45,7 +45,7 @@
#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_NETWORK
diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index 8474b2a..8333c38 100644
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -44,7 +44,7 @@
#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "threads.h"
#if HAVE_FIREWALLD
diff --git a/src/util/virevent.c b/src/util/virevent.c
index 7d11f85..573b4ac 100644
--- a/src/util/virevent.c
+++ b/src/util/virevent.c
@@ -25,7 +25,7 @@
#include "virevent.h"
#include "vireventpoll.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include <stdlib.h>
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index 9fd196d..0256d83 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -32,7 +32,7 @@
#include <fcntl.h>
#include "threads.h"
-#include "logging.h"
+#include "virlog.h"
#include "vireventpoll.h"
#include "memory.h"
#include "util.h"
diff --git a/src/util/virfile.c b/src/util/virfile.c
index d77b726..30294a2 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -41,7 +41,7 @@
#include "configmake.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virhash.c b/src/util/virhash.c
index 1576dd3..077abca 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "virhash.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virhashcode.h"
#include "virrandom.h"
diff --git a/src/util/virhook.c b/src/util/virhook.c
index 0e83f0b..d8969ad 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -33,7 +33,7 @@
#include "virterror_internal.h"
#include "virhook.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "virfile.h"
#include "configmake.h"
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 8831920..ee3e9a0 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -42,7 +42,7 @@
#include "vircommand.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "threads.h"
#if HAVE_FIREWALLD
diff --git a/src/util/virjson.c b/src/util/virjson.c
index a07dd5c..18a28ba 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -26,7 +26,7 @@
#include "virjson.h"
#include "memory.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#if HAVE_YAJL
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index 3c2ce26..b43b92d 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -26,7 +26,7 @@
#include <stdio.h>
#include "c-ctype.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "util.h"
#include "virhash.h"
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 99b6182..b652294 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "virlockspace.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "virterror_internal.h"
#include "util.h"
diff --git a/src/util/logging.c b/src/util/virlog.c
similarity index 99%
rename from src/util/logging.c
rename to src/util/virlog.c
index 0df3549..d179de2 100644
--- a/src/util/logging.c
+++ b/src/util/virlog.c
@@ -41,7 +41,7 @@
#endif
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "util.h"
#include "virbuffer.h"
diff --git a/src/util/logging.h b/src/util/virlog.h
similarity index 100%
rename from src/util/logging.h
rename to src/util/virlog.h
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index e98a2ca..a1d1c12 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -29,7 +29,7 @@
#include "vircommand.h"
#include "memory.h"
#include "pci.h"
-#include "logging.h"
+#include "virlog.h"
#include <sys/ioctl.h>
#include <net/if.h>
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 657c484..8d2574c 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -57,7 +57,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
# endif
# include "memory.h"
-# include "logging.h"
+# include "virlog.h"
# include "uuid.h"
# include "virfile.h"
# include "virnetlink.h"
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 0eadd6c..644e9a4 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -31,7 +31,7 @@
#include "virfile.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include <sys/ioctl.h>
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index 3261337..630b7c9 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -27,7 +27,7 @@
#include "virnetdevveth.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "vircommand.h"
#include "virterror_internal.h"
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index ac7aa5f..834b9b9 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -53,7 +53,7 @@ VIR_ENUM_IMPL(virNetDevVPortProfileOp,
VIR_NETDEV_VPORT_PROFILE_OP_LAST,
# include "virnetlink.h"
# include "virfile.h"
-# include "logging.h"
+# include "virlog.h"
# include "virnetdev.h"
# define MICROSEC_PER_SEC (1000 * 1000)
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 8a8bfae..830e9b9 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -36,7 +36,7 @@
#include <sys/socket.h>
#include "virnetlink.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "threads.h"
#include "virmacaddr.h"
diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index a34ca6a..e37a2d6 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -27,7 +27,7 @@
#include "datatypes.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virobject.c b/src/util/virobject.c
index 101507f..aa80cab 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -26,7 +26,7 @@
#include "memory.h"
#include "viratomic.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 90a79c5..6ec9760 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -32,7 +32,7 @@
#include "memory.h"
#include "util.h"
#include "intprops.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "c-ctype.h"
#include "areadlink.h"
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index f8a8a49..3c0ed8a 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -29,7 +29,7 @@
#include "virprocess.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 002f655..c24bf3b 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -31,7 +31,7 @@
#include "count-one-bits.h"
#include "util.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virterror.c b/src/util/virterror.c
index 1142c40..6e3301b 100644
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -29,7 +29,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "threads.h"
#include "util.h"
diff --git a/src/util/virusb.c b/src/util/virusb.c
index ef7aff3..d980026 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include "virusb.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
#include "util.h"
#include "virterror_internal.h"
diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index 9ddc89c..3194b7c 100644
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -32,7 +32,7 @@
#include "internal.h"
#include "memory.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "vbox_MSCOMGlue.h"
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 63470ae..5f70283 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -39,7 +39,7 @@
#include "internal.h"
#include "memory.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_VBOX
diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index 56726ed..cd29e19 100644
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "datatypes.h"
-#include "logging.h"
+#include "virlog.h"
#include "vbox_driver.h"
#include "vbox_glue.h"
#include "virterror_internal.h"
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 383b1a5..3a45646 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -51,7 +51,7 @@
#include "uuid.h"
#include "memory.h"
#include "nodeinfo.h"
-#include "logging.h"
+#include "virlog.h"
#include "vbox_driver.h"
#include "configmake.h"
#include "virfile.h"
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 4de9f33..e34e15e 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -29,7 +29,7 @@
#include "virterror_internal.h"
#include "virconf.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "vmx.h"
#include "viruri.h"
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index d9174b6..c281c00 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -40,7 +40,7 @@
#include <xen/dom0_ops.h>
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "xen_driver.h"
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index f7daaa6..d6d3874 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -63,7 +63,7 @@
#include <xen/sched.h>
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "driver.h"
#include "util.h"
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index bcafdd0..073663f 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -36,7 +36,7 @@
#include "domain_conf.h"
#include "xen_inotify.h"
#include "xend_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "virfile.h"
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 9407e95..0364f84 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -30,7 +30,7 @@
#include <errno.h>
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "datatypes.h"
#include "xend_internal.h"
#include "driver.h"
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 2cd4b95..fc7b581 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -47,7 +47,7 @@
#include "uuid.h"
#include "util.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "count-one-bits.h"
#define VIR_FROM_THIS VIR_FROM_XENXM
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 8a0af62..4cc82d8 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -45,7 +45,7 @@
#include "datatypes.h"
#include "driver.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "uuid.h"
#include "xen_driver.h"
#include "xs_internal.h"
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index dbdb22d..6f51100 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -33,7 +33,7 @@
#include "uuid.h"
#include "memory.h"
#include "virbuffer.h"
-#include "logging.h"
+#include "virlog.h"
#include "viruri.h"
#include "xenapi_driver_private.h"
#include "xenapi_utils.h"
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index ed0c9e1..2aa384d 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -32,7 +32,7 @@
#include "memory.h"
#include "verify.h"
#include "uuid.h"
-#include "logging.h"
+#include "virlog.h"
#include "count-one-bits.h"
#include "xenxs_private.h"
#include "xen_sxpr.h"
diff --git a/tests/eventtest.c b/tests/eventtest.c
index bc8d443..cd36a2d 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -29,7 +29,7 @@
#include "testutils.h"
#include "internal.h"
#include "threads.h"
-#include "logging.h"
+#include "virlog.h"
#include "util.h"
#include "vireventpoll.h"
diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index c2b02a6..0365ade 100644
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -27,7 +27,7 @@
#include "util.h"
#include "c-ctype.h"
#include "virterror_internal.h"
-#include "logging.h"
+#include "virlog.h"
#include "virconf.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index b55d867..e4194de 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -31,7 +31,7 @@
#include "rpc/virnetsocket.h"
#include "memory.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 0fa70ba..f8a2481 100644
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -32,7 +32,7 @@
#include "testutils.h"
#include "memory.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#include "virterror_internal.h"
#include "security/security_manager.h"
diff --git a/tests/sockettest.c b/tests/sockettest.c
index 2f85307..c6a175f 100644
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -27,7 +27,7 @@
#include "virsocketaddr.h"
#include "testutils.h"
-#include "logging.h"
+#include "virlog.h"
#include "memory.h"
static void testQuietError(void *userData ATTRIBUTE_UNUSED,
diff --git a/tests/testutils.c b/tests/testutils.c
index 1315cb5..96e24d4 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -44,7 +44,7 @@
#include "threads.h"
#include "virterror_internal.h"
#include "virbuffer.h"
-#include "logging.h"
+#include "virlog.h"
#include "vircommand.h"
#include "virrandom.h"
#include "dirname.h"
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 4d37af6..74cc187 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -27,7 +27,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virauthconfig.h"
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 53a772e..440ee8e 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -24,7 +24,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "driver.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index 721e877..7de16d0 100644
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -11,7 +11,7 @@
#include "testutils.h"
#include "memory.h"
#include "util.h"
-#include "logging.h"
+#include "virlog.h"
#define testError(...) \
diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index 3667c8c..c6aca86 100644
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -27,7 +27,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virkeyfile.h"
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index ee58f95..c95f5d8 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -28,7 +28,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virlockspace.h"
diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index eff8ea7..c20f5e6 100644
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -27,7 +27,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "rpc/virnetmessage.h"
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index e31f19a..ba281e9 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -31,7 +31,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "rpc/virnetsocket.h"
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index d421feb..0236659 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -30,7 +30,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virfile.h"
#include "vircommand.h"
#include "virsocketaddr.h"
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 7e726c6..27e490f 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -26,7 +26,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virstring.h"
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index dca4efb..c8e9a2e 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -27,7 +27,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "virtime.h"
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 430bcb6..46964b3 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -27,7 +27,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "memory.h"
-#include "logging.h"
+#include "virlog.h"
#include "viruri.h"
diff --git a/tools/console.c b/tools/console.c
index 40de8eb..dbdaab7 100644
--- a/tools/console.c
+++ b/tools/console.c
@@ -38,7 +38,7 @@
# include "internal.h"
# include "console.h"
-# include "logging.h"
+# include "virlog.h"
# include "util.h"
# include "virfile.h"
# include "memory.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 15/28] Rename memory.{c,h} to viralloc.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
cfg.mk | 6 +++---
daemon/libvirtd-config.c | 2 +-
daemon/libvirtd.c | 2 +-
daemon/remote.c | 2 +-
daemon/stream.c | 2 +-
python/libvirt-override.c | 2 +-
python/typewrappers.c | 2 +-
src/Makefile.am | 2 +-
src/conf/capabilities.c | 2 +-
src/conf/cpu_conf.c | 2 +-
src/conf/device_conf.c | 2 +-
src/conf/domain_audit.c | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/domain_event.c | 2 +-
src/conf/interface_conf.c | 2 +-
src/conf/netdev_bandwidth_conf.c | 2 +-
src/conf/netdev_vlan_conf.c | 2 +-
src/conf/netdev_vport_profile_conf.c | 2 +-
src/conf/network_conf.c | 2 +-
src/conf/node_device_conf.c | 4 ++--
src/conf/nwfilter_conf.c | 2 +-
src/conf/nwfilter_params.c | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/conf/storage_encryption_conf.c | 2 +-
src/conf/virconsole.c | 2 +-
src/cpu/cpu.c | 2 +-
src/cpu/cpu_arm.c | 2 +-
src/cpu/cpu_generic.c | 2 +-
src/cpu/cpu_map.c | 2 +-
src/cpu/cpu_powerpc.c | 2 +-
src/cpu/cpu_s390.c | 2 +-
src/cpu/cpu_x86.c | 2 +-
src/datatypes.c | 2 +-
src/driver.c | 2 +-
src/esx/esx_device_monitor.c | 2 +-
src/esx/esx_driver.c | 2 +-
src/esx/esx_interface_driver.c | 2 +-
src/esx/esx_network_driver.c | 2 +-
src/esx/esx_nwfilter_driver.c | 2 +-
src/esx/esx_secret_driver.c | 2 +-
src/esx/esx_storage_backend_iscsi.c | 2 +-
src/esx/esx_storage_backend_vmfs.c | 2 +-
src/esx/esx_storage_driver.c | 2 +-
src/esx/esx_util.c | 2 +-
src/esx/esx_vi.c | 2 +-
src/esx/esx_vi_methods.c | 2 +-
src/esx/esx_vi_types.c | 2 +-
src/fdstream.c | 2 +-
src/hyperv/hyperv_device_monitor.c | 2 +-
src/hyperv/hyperv_driver.c | 2 +-
src/hyperv/hyperv_interface_driver.c | 2 +-
src/hyperv/hyperv_network_driver.c | 2 +-
src/hyperv/hyperv_nwfilter_driver.c | 2 +-
src/hyperv/hyperv_secret_driver.c | 2 +-
src/hyperv/hyperv_storage_driver.c | 2 +-
src/hyperv/hyperv_util.c | 2 +-
src/hyperv/hyperv_wmi.c | 2 +-
src/interface/interface_backend_netcf.c | 2 +-
src/interface/interface_backend_udev.c | 2 +-
src/libvirt.c | 2 +-
src/libxl/libxl_conf.c | 2 +-
src/libxl/libxl_driver.c | 2 +-
src/locking/domain_lock.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/locking/lock_daemon_config.c | 2 +-
src/locking/lock_driver_lockd.c | 2 +-
src/locking/lock_driver_nop.c | 2 +-
src/locking/lock_driver_sanlock.c | 2 +-
src/locking/lock_manager.c | 2 +-
src/locking/sanlock_helper.c | 2 +-
src/lxc/lxc_cgroup.c | 2 +-
src/lxc/lxc_conf.c | 2 +-
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/lxc/lxc_domain.c | 2 +-
src/lxc/lxc_driver.c | 2 +-
src/lxc/lxc_fuse.h | 2 +-
src/lxc/lxc_hostdev.c | 2 +-
src/lxc/lxc_monitor.c | 2 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/node_device/node_device_driver.c | 2 +-
src/node_device/node_device_hal.c | 2 +-
src/node_device/node_device_linux_sysfs.c | 2 +-
src/node_device/node_device_udev.c | 2 +-
src/nodeinfo.c | 2 +-
src/nwfilter/nwfilter_dhcpsnoop.c | 2 +-
src/nwfilter/nwfilter_driver.c | 2 +-
src/nwfilter/nwfilter_ebiptables_driver.c | 2 +-
src/nwfilter/nwfilter_gentech_driver.c | 2 +-
src/nwfilter/nwfilter_learnipaddr.c | 2 +-
src/openvz/openvz_conf.c | 2 +-
src/openvz/openvz_driver.c | 2 +-
src/openvz/openvz_util.c | 2 +-
src/parallels/parallels_driver.c | 2 +-
src/parallels/parallels_network.c | 2 +-
src/parallels/parallels_storage.c | 2 +-
src/parallels/parallels_utils.c | 2 +-
src/phyp/phyp_driver.c | 2 +-
src/qemu/qemu_agent.c | 2 +-
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_cgroup.c | 2 +-
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hostdev.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_migration.c | 2 +-
src/qemu/qemu_monitor.c | 2 +-
src/qemu/qemu_monitor_json.c | 2 +-
src/qemu/qemu_monitor_text.c | 2 +-
src/qemu/qemu_process.c | 2 +-
src/remote/remote_driver.c | 2 +-
src/rpc/virkeepalive.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetclientprogram.c | 2 +-
src/rpc/virnetclientstream.c | 2 +-
src/rpc/virnetmessage.c | 2 +-
src/rpc/virnetsaslcontext.c | 2 +-
src/rpc/virnetserver.c | 2 +-
src/rpc/virnetserverclient.c | 2 +-
src/rpc/virnetservermdns.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/security/security_apparmor.c | 2 +-
src/security/security_dac.c | 2 +-
src/security/security_manager.c | 2 +-
src/security/security_selinux.c | 2 +-
src/security/security_stack.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/storage/storage_backend.c | 2 +-
src/storage/storage_backend_disk.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/storage/storage_backend_iscsi.c | 2 +-
src/storage/storage_backend_logical.c | 2 +-
src/storage/storage_backend_mpath.c | 2 +-
src/storage/storage_backend_rbd.c | 2 +-
src/storage/storage_backend_scsi.c | 2 +-
src/storage/storage_backend_sheepdog.c | 2 +-
src/storage/storage_driver.c | 2 +-
src/test/test_driver.c | 2 +-
src/uml/uml_conf.c | 2 +-
src/uml/uml_driver.c | 2 +-
src/util/iohelper.c | 2 +-
src/util/pci.c | 2 +-
src/util/sexpr.c | 2 +-
src/util/stats_linux.c | 2 +-
src/util/storage_file.c | 2 +-
src/util/sysinfo.c | 2 +-
src/util/threadpool.c | 2 +-
src/util/threads-pthread.c | 2 +-
src/util/threads-win32.c | 2 +-
src/util/util.c | 2 +-
src/util/uuid.c | 2 +-
src/util/{memory.c => viralloc.c} | 2 +-
src/util/{memory.h => viralloc.h} | 0
src/util/viraudit.c | 2 +-
src/util/virauth.c | 2 +-
src/util/virauthconfig.c | 2 +-
src/util/virbitmap.c | 2 +-
src/util/virbuffer.c | 2 +-
src/util/vircgroup.c | 2 +-
src/util/vircommand.c | 2 +-
src/util/virconf.c | 2 +-
src/util/virdbus.c | 2 +-
src/util/virdnsmasq.c | 2 +-
src/util/virebtables.c | 2 +-
src/util/vireventpoll.c | 2 +-
src/util/virfile.c | 2 +-
src/util/virhash.c | 2 +-
src/util/virhook.c | 2 +-
src/util/virinitctl.c | 2 +-
src/util/viriptables.c | 2 +-
src/util/virjson.c | 2 +-
src/util/virkeyfile.c | 2 +-
src/util/virlockspace.c | 2 +-
src/util/virlog.c | 2 +-
src/util/virnetdev.c | 2 +-
src/util/virnetdevbandwidth.c | 2 +-
src/util/virnetdevbridge.c | 2 +-
src/util/virnetdevmacvlan.c | 2 +-
src/util/virnetdevopenvswitch.c | 2 +-
src/util/virnetdevtap.c | 2 +-
src/util/virnetdevveth.c | 2 +-
src/util/virnetdevvlan.c | 2 +-
src/util/virnetdevvportprofile.c | 2 +-
src/util/virnetlink.c | 2 +-
src/util/virnodesuspend.c | 2 +-
src/util/virobject.c | 2 +-
src/util/virpidfile.c | 2 +-
src/util/virprocess.c | 2 +-
src/util/virstring.c | 2 +-
src/util/virterror.c | 2 +-
src/util/virtime.c | 2 +-
src/util/virtypedparam.c | 2 +-
src/util/viruri.c | 2 +-
src/util/virusb.c | 2 +-
src/util/xml.c | 2 +-
src/vbox/vbox_MSCOMGlue.c | 2 +-
src/vbox/vbox_XPCOMCGlue.c | 2 +-
src/vbox/vbox_tmpl.c | 2 +-
src/vmware/vmware_conf.c | 2 +-
src/vmware/vmware_driver.c | 2 +-
src/vmx/vmx.c | 2 +-
src/xen/block_stats.c | 2 +-
src/xen/xen_driver.c | 2 +-
src/xen/xen_hypervisor.c | 2 +-
src/xen/xen_inotify.c | 2 +-
src/xen/xend_internal.c | 2 +-
src/xen/xm_internal.c | 2 +-
src/xen/xs_internal.c | 2 +-
src/xenapi/xenapi_driver.c | 2 +-
src/xenapi/xenapi_utils.c | 2 +-
src/xenxs/xen_sxpr.c | 2 +-
src/xenxs/xen_xm.c | 2 +-
tests/commandhelper.c | 2 +-
tests/commandtest.c | 2 +-
tests/conftest.c | 2 +-
tests/cputest.c | 2 +-
tests/esxutilstest.c | 2 +-
tests/networkxml2conftest.c | 2 +-
tests/openvzutilstest.c | 2 +-
tests/qemuhelptest.c | 2 +-
tests/qemumonitortest.c | 2 +-
tests/qemumonitortestutils.c | 2 +-
tests/qemuxml2argvtest.c | 2 +-
tests/securityselinuxtest.c | 2 +-
tests/sockettest.c | 2 +-
tests/testutils.c | 2 +-
tests/testutils.h | 2 +-
tests/testutilslxc.c | 2 +-
tests/testutilsqemu.c | 2 +-
tests/utiltest.c | 2 +-
tests/virauthconfigtest.c | 2 +-
tests/virbuftest.c | 2 +-
tests/virdrivermoduletest.c | 2 +-
tests/virhashtest.c | 2 +-
tests/virkeyfiletest.c | 2 +-
tests/virlockspacetest.c | 2 +-
tests/virnetmessagetest.c | 2 +-
tests/virnetsockettest.c | 2 +-
tests/virnettlscontexttest.c | 2 +-
tests/virstringtest.c | 2 +-
tests/virtimetest.c | 2 +-
tests/viruritest.c | 2 +-
tests/vmx2xmltest.c | 2 +-
tests/xmconfigtest.c | 2 +-
tests/xml2vmxtest.c | 2 +-
tools/console.c | 2 +-
tools/virsh-domain-monitor.c | 2 +-
tools/virsh-domain.c | 2 +-
tools/virsh-host.c | 2 +-
tools/virsh-interface.c | 2 +-
tools/virsh-network.c | 2 +-
tools/virsh-nodedev.c | 2 +-
tools/virsh-nwfilter.c | 2 +-
tools/virsh-pool.c | 2 +-
tools/virsh-secret.c | 2 +-
tools/virsh-snapshot.c | 2 +-
tools/virsh-volume.c | 2 +-
tools/virsh.c | 2 +-
tools/virt-host-validate-common.c | 2 +-
269 files changed, 271 insertions(+), 271 deletions(-)
rename src/util/{memory.c => viralloc.c} (99%)
rename src/util/{memory.h => viralloc.h} (100%)
diff --git a/cfg.mk b/cfg.mk
index f4431c0..cdd02e4 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -321,7 +321,7 @@ sc_prohibit_internal_functions:
# Avoid raw malloc and free, except in documentation comments.
sc_prohibit_raw_allocation:
@prohibit='^.[^*].*\<((m|c|re)alloc|free) *\([^)]' \
- halt='use VIR_ macros from memory.h instead of malloc/free' \
+ halt='use VIR_ macros from viralloc.h instead of malloc/free' \
$(_sc_search_regexp)
# Avoid functions that can lead to double-close bugs.
@@ -785,7 +785,7 @@ exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/util\.c$$
exclude_file_name_regexp--sc_prohibit_internal_functions = \
- ^src/(util/(memory|util|virfile)\.[hc]|esx/esx_vi\.c)$$
+ ^src/(util/(viralloc|util|virfile)\.[hc]|esx/esx_vi\.c)$$
exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \
^src/rpc/gendispatch\.pl$$
@@ -794,7 +794,7 @@ exclude_file_name_regexp--sc_prohibit_nonreentrant = \
^((po|tests)/|docs/.*py|run.in$$)
exclude_file_name_regexp--sc_prohibit_raw_allocation = \
- ^(src/util/memory\.[ch]|examples/.*)$$
+ ^(src/util/viralloc\.[ch]|examples/.*)$$
exclude_file_name_regexp--sc_prohibit_readlink = \
^src/(util/util|lxc/lxc_container)\.c$$
diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index f61f08d..b979a23 100644
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -25,7 +25,7 @@
#include "libvirtd-config.h"
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "rpc/virnetserver.h"
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 2a2897a..9f82c99 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -46,7 +46,7 @@
#include "util.h"
#include "uuid.h"
#include "remote_driver.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virconf.h"
#include "virnetlink.h"
#include "virnetserver.h"
diff --git a/daemon/remote.c b/daemon/remote.c
index bb38689..7c7f806 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -33,7 +33,7 @@
#include "libvirtd.h"
#include "libvirt_internal.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "util.h"
#include "stream.h"
diff --git a/daemon/stream.c b/daemon/stream.c
index d63e009..f208139 100644
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -25,7 +25,7 @@
#include "stream.h"
#include "remote.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virnetserverclient.h"
#include "virterror_internal.h"
diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index eda8a11..644f34d 100644
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -24,7 +24,7 @@
#include "libvirt/virterror.h"
#include "typewrappers.h"
#include "libvirt.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virtypedparam.h"
#include "ignore-value.h"
#include "util.h"
diff --git a/python/typewrappers.c b/python/typewrappers.c
index d633603..9ba8790 100644
--- a/python/typewrappers.c
+++ b/python/typewrappers.c
@@ -16,7 +16,7 @@
#include "typewrappers.h"
-#include "memory.h"
+#include "viralloc.h"
#ifndef Py_CAPSULE_H
typedef void(*PyCapsule_Destructor)(void *, void *);
diff --git a/src/Makefile.am b/src/Makefile.am
index 59958c6..25c7cca 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/memory.c util/memory.h \
util/pci.c util/pci.h \
util/processinfo.c util/processinfo.h \
util/sexpr.c util/sexpr.h \
@@ -66,6 +65,7 @@ UTIL_SOURCES = \
util/threadpool.c util/threadpool.h \
util/uuid.c util/uuid.h \
util/util.c util/util.h \
+ util/viralloc.c util/viralloc.h \
util/virarch.h util/virarch.c \
util/viratomic.h util/viratomic.c \
util/viraudit.c util/viraudit.h \
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 76db89a..694e9b9 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -27,7 +27,7 @@
#include "capabilities.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "uuid.h"
#include "cpu_conf.h"
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 9b86571..6011361 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virbuffer.h"
#include "cpu_conf.h"
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index daf57bc..c3ca2d6 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "virterror_internal.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "xml.h"
#include "uuid.h"
#include "util.h"
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index a73c723..8919e62 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -30,7 +30,7 @@
#include "viraudit.h"
#include "uuid.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
/* Return nn:mm in hex for block and character devices, and NULL
* for other file types, stat failure, or allocation failure. */
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2c92de6..49946b7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -34,7 +34,7 @@
#include "datatypes.h"
#include "domain_conf.h"
#include "snapshot_conf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "verify.h"
#include "xml.h"
#include "uuid.h"
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index f1e247b..d523808 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -26,7 +26,7 @@
#include "domain_event.h"
#include "virlog.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 738ef33..046a8a1 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -27,7 +27,7 @@
#include "interface_conf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "xml.h"
#include "uuid.h"
#include "util.h"
diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 15840b9..35f067c 100644
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -25,7 +25,7 @@
#include "netdev_bandwidth_conf.h"
#include "virterror_internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "domain_conf.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c
index 6a0511a..8cee025 100644
--- a/src/conf/netdev_vlan_conf.c
+++ b/src/conf/netdev_vlan_conf.c
@@ -23,7 +23,7 @@
#include "netdev_vlan_conf.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index 94992e3..a9a38d7 100644
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -24,7 +24,7 @@
#include "netdev_vport_profile_conf.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 42cb87e..1932851 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -37,7 +37,7 @@
#include "netdev_vport_profile_conf.h"
#include "netdev_bandwidth_conf.h"
#include "netdev_vlan_conf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "xml.h"
#include "uuid.h"
#include "util.h"
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 50fcf0b..85de50f 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -28,10 +28,10 @@
#include "virterror_internal.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "node_device_conf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "xml.h"
#include "util.h"
#include "virbuffer.h"
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 46580e9..09a9d1c 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -39,7 +39,7 @@
#include "internal.h"
#include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "datatypes.h"
#include "nwfilter_params.h"
diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index f8cf980..1429952 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -25,7 +25,7 @@
#include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "datatypes.h"
#include "nwfilter_params.h"
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 24d7aa0..5188c7a 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -26,7 +26,7 @@
#include "virbuffer.h"
#include "datatypes.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "secret_conf.h"
#include "virterror_internal.h"
#include "util.h"
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 6361810..9c16a88 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -35,7 +35,7 @@
#include "datatypes.h"
#include "domain_conf.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "netdev_bandwidth_conf.h"
#include "netdev_vport_profile_conf.h"
#include "nwfilter_conf.h"
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index b81c08c..0e00588 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -42,7 +42,7 @@
#include "uuid.h"
#include "virbuffer.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 0c2bded..8d3ceac 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "storage_conf.h"
#include "storage_encryption_conf.h"
#include "util.h"
diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c
index 92179cc..757573d 100644
--- a/src/conf/virconsole.c
+++ b/src/conf/virconsole.c
@@ -32,7 +32,7 @@
#include "fdstream.h"
#include "internal.h"
#include "threads.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virpidfile.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index be1f4ce..302629d 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "xml.h"
#include "cpu.h"
#include "cpu_x86.h"
diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index 36c9db0..cfe1a23 100644
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "memory.h"
+#include "viralloc.h"
#include "cpu.h"
#define VIR_FROM_THIS VIR_FROM_CPU
diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c
index b10ff47..5dfa6a2 100644
--- a/src/cpu/cpu_generic.c
+++ b/src/cpu/cpu_generic.c
@@ -24,7 +24,7 @@
#include <config.h>
-#include "memory.h"
+#include "viralloc.h"
#include "virhash.h"
#include "cpu.h"
#include "cpu_generic.h"
diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
index 8c4cfee..015be2e 100644
--- a/src/cpu/cpu_map.c
+++ b/src/cpu/cpu_map.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "memory.h"
+#include "viralloc.h"
#include "cpu.h"
#include "cpu_map.h"
#include "configmake.h"
diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index 26991d8..cbc813b 100644
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -27,7 +27,7 @@
#include <stdint.h>
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "cpu.h"
diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index ffbad03..998197c 100644
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "memory.h"
+#include "viralloc.h"
#include "cpu.h"
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 2970573..55e20c9 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -26,7 +26,7 @@
#include <stdint.h>
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "cpu.h"
#include "cpu_map.h"
diff --git a/src/datatypes.c b/src/datatypes.c
index 73a2fd0..0907c7d 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -25,7 +25,7 @@
#include "datatypes.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "util.h"
diff --git a/src/driver.c b/src/driver.c
index 4ef6fd2..23dc329 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include "driver.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "util.h"
#include "configmake.h"
diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 0ad95f5..854fc38 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "esx_private.h"
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 488d18d..346b9bc 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -29,7 +29,7 @@
#include "snapshot_conf.h"
#include "virauth.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "vmx.h"
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index 4760264..fea67ab 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "interface_conf.h"
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 3e25aa2..fec7e72 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -27,7 +27,7 @@
#include "md5.h"
#include "internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "network_conf.h"
diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index f5e710d..7a05a5a 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "esx_private.h"
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 2a98644..2969b19 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -25,7 +25,7 @@
#include "internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "esx_private.h"
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 5d4eb3c..9d481d2 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -29,7 +29,7 @@
#include "internal.h"
#include "md5.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "storage_conf.h"
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index c8bba9e..bca637b 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -32,7 +32,7 @@
#include "internal.h"
#include "md5.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "storage_conf.h"
diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index e6c09aa..1324469 100644
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -26,7 +26,7 @@
#include <config.h>
#include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
#include "storage_conf.h"
#include "esx_private.h"
#include "esx_storage_driver.h"
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 6e27fe4..bcda9df 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -29,7 +29,7 @@
#include "internal.h"
#include "datatypes.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "vmx.h"
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 76192df..37b6e0f 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -27,7 +27,7 @@
#include <libxml/xpathInternals.h>
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "util.h"
#include "uuid.h"
diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index a3870ee..7ffca559 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "esx_vi_methods.h"
diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index d0a2c6c..b93223d 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -29,7 +29,7 @@
#include "virbuffer.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "util.h"
#include "esx_vi.h"
diff --git a/src/fdstream.c b/src/fdstream.c
index fdbd7a2..39e92b8 100644
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -36,7 +36,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virfile.h"
#include "configmake.h"
diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index 1fa98b2..d6edb76 100644
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "hyperv_device_monitor.h"
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 95b0cd9..749c7f0 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -28,7 +28,7 @@
#include "domain_conf.h"
#include "virauth.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "hyperv_driver.h"
diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 6a3c2cb..43c7dd7 100644
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "hyperv_interface_driver.h"
diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index 2f9fcab..06b051b 100644
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "hyperv_network_driver.h"
diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index c490522..7452b7a 100644
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "hyperv_nwfilter_driver.h"
diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index 3d58b01..04a6ada 100644
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "hyperv_secret_driver.h"
diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 7fbc14d..b2817a2 100644
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "hyperv_storage_driver.h"
diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 1ef6dae..016d415 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -25,7 +25,7 @@
#include "internal.h"
#include "datatypes.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "hyperv_private.h"
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 069ebe6..69e7283 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -28,7 +28,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "uuid.h"
#include "virbuffer.h"
diff --git a/src/interface/interface_backend_netcf.c
b/src/interface/interface_backend_netcf.c
index 1f42920..74a749b 100644
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -29,7 +29,7 @@
#include "datatypes.h"
#include "interface_driver.h"
#include "interface_conf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_INTERFACE
diff --git a/src/interface/interface_backend_udev.c
b/src/interface/interface_backend_udev.c
index 9233e87..248b02e 100644
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -27,7 +27,7 @@
#include "datatypes.h"
#include "interface_driver.h"
#include "interface_conf.h"
-#include "memory.h"
+#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_INTERFACE
diff --git a/src/libvirt.c b/src/libvirt.c
index d078304..ed7dcae 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -51,7 +51,7 @@
#include "driver.h"
#include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
#include "configmake.h"
#include "intprops.h"
#include "virconf.h"
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 0ccab50..5b20c39 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -36,7 +36,7 @@
#include "datatypes.h"
#include "virfile.h"
#include "virstring.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "capabilities.h"
#include "libxl_driver.h"
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index b7e6630..4db2614 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -36,7 +36,7 @@
#include "virconf.h"
#include "datatypes.h"
#include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "vircommand.h"
#include "libxl.h"
diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 00861cf..0ae9750 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "domain_lock.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 3c2a50c..3d90c57 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -39,7 +39,7 @@
#include "virprocess.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virconf.h"
#include "rpc/virnetserver.h"
#include "virrandom.h"
diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index 9557b8c..e370dd4 100644
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -25,7 +25,7 @@
#include "lock_daemon_config.h"
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "rpc/virnetserver.h"
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index d5d721d..cee530d 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -23,7 +23,7 @@
#include "lock_driver.h"
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "util.h"
diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c
index 745a0bf..cf0f49a 100644
--- a/src/locking/lock_driver_nop.c
+++ b/src/locking/lock_driver_nop.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "lock_driver_nop.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 1e8df26..e520444 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -39,7 +39,7 @@
#include "lock_driver.h"
#include "virlog.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virfile.h"
#include "md5.h"
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index f038d4e..f938b04 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -26,7 +26,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#if HAVE_DLFCN_H
diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c
index ad69312..3e400b7 100644
--- a/src/locking/sanlock_helper.c
+++ b/src/locking/sanlock_helper.c
@@ -6,7 +6,7 @@
#include "configmake.h"
#include "internal.h"
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "domain_conf.h"
diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index d023b84..74f3156 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -26,7 +26,7 @@
#include "virfile.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "vircgroup.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index a5ba2f7..ede79d1 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -30,7 +30,7 @@
#include "nodeinfo.h"
#include "virterror_internal.h"
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "configmake.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 760d3af..6b66fde 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -57,7 +57,7 @@
#include "virlog.h"
#include "lxc_container.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virnetdevveth.h"
#include "uuid.h"
#include "virfile.h"
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index f0e08e3..4520a5f 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -62,7 +62,7 @@
#include "lxc_fuse.h"
#include "virnetdev.h"
#include "virnetdevveth.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virfile.h"
#include "virpidfile.h"
diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 77a64dd..fab1506 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -23,7 +23,7 @@
#include "lxc_domain.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 8265328..a595dd9 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -45,7 +45,7 @@
#include "lxc_domain.h"
#include "lxc_driver.h"
#include "lxc_process.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virnetdevbridge.h"
#include "virnetdevveth.h"
diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index a888122..9878017 100644
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -33,7 +33,7 @@
# include "lxc_conf.h"
# include "util.h"
-# include "memory.h"
+# include "viralloc.h"
struct virLXCMeminfo {
unsigned long long memtotal;
diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index aa450ec..f01fc56 100644
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -24,9 +24,9 @@
#include <config.h>
#include "lxc_hostdev.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
-#include "memory.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 9eb587d..90637eb 100644
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -25,7 +25,7 @@
#include "lxc_protocol.h"
#include "lxc_monitor_dispatch.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 762a23d..00bc1c6 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -38,7 +38,7 @@
#include "virtime.h"
#include "domain_nwfilter.h"
#include "network/bridge_driver.h"
-#include "memory.h"
+#include "viralloc.h"
#include "domain_audit.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index e336503..2265e5f 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -54,7 +54,7 @@
#include "virpidfile.h"
#include "util.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "viriptables.h"
#include "virlog.h"
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 48360e3..d914816 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -32,7 +32,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "node_device_conf.h"
#include "node_device_hal.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 59ba5c3..6f89f16 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -33,7 +33,7 @@
#include "virterror_internal.h"
#include "driver.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "pci.h"
#include "virlog.h"
diff --git a/src/node_device/node_device_linux_sysfs.c
b/src/node_device/node_device_linux_sysfs.c
index fbe0da5..be5d3ed 100644
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -29,7 +29,7 @@
#include "node_device_driver.h"
#include "node_device_hal.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index fef00ad..81a11d7 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -33,7 +33,7 @@
#include "driver.h"
#include "datatypes.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "util.h"
#include "virbuffer.h"
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 1e68019..efce29c 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -39,7 +39,7 @@
#endif
#include "c-ctype.h"
-#include "memory.h"
+#include "viralloc.h"
#include "nodeinfo.h"
#include "physmem.h"
#include "util.h"
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index 68aa233..a798e95 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -54,7 +54,7 @@
#include <netinet/udp.h>
#include <net/if.h>
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "datatypes.h"
#include "virterror_internal.h"
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 7fde656..4b1188d 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -34,7 +34,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "domain_conf.h"
#include "domain_nwfilter.h"
#include "nwfilter_conf.h"
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c
b/src/nwfilter/nwfilter_ebiptables_driver.c
index 23a43d2..092ae5a 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -31,7 +31,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
#include "domain_conf.h"
diff --git a/src/nwfilter/nwfilter_gentech_driver.c
b/src/nwfilter/nwfilter_gentech_driver.c
index 6be4a93..2b4cc8e 100644
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "domain_conf.h"
#include "virterror_internal.h"
diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 110eae8..8c4bbcf 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -42,7 +42,7 @@
#include "intprops.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "datatypes.h"
#include "virnetdev.h"
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 5448a33..7e42b51 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -47,7 +47,7 @@
#include "openvz_util.h"
#include "uuid.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "nodeinfo.h"
#include "virfile.h"
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index e51bf29..4c88499 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -52,7 +52,7 @@
#include "util.h"
#include "openvz_conf.h"
#include "nodeinfo.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#include "virtypedparam.h"
#include "virlog.h"
diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index 4163e19..51b22c9 100644
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -28,7 +28,7 @@
#include "virterror_internal.h"
#include "vircommand.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "openvz_conf.h"
#include "openvz_util.h"
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index cc65117..e3d2711 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -42,7 +42,7 @@
#include "datatypes.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virlog.h"
#include "vircommand.h"
diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 40706aa..4729f18 100644
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "md5.h"
diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c
index 90fa104..f546d28 100644
--- a/src/parallels/parallels_storage.c
+++ b/src/parallels/parallels_storage.c
@@ -31,7 +31,7 @@
#include <libgen.h>
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "configmake.h"
#include "storage_file.h"
#include "virterror_internal.h"
diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index b032882..9e317b1 100644
--- a/src/parallels/parallels_utils.c
+++ b/src/parallels/parallels_utils.c
@@ -26,7 +26,7 @@
#include "vircommand.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virjson.h"
#include "parallels_utils.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index f1d994c..b09156f 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -47,7 +47,7 @@
#include "util.h"
#include "datatypes.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "driver.h"
#include "libvirt/libvirt.h"
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 421e43f..ec1e300 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -34,7 +34,7 @@
#include "qemu_agent.h"
#include "qemu_command.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
#include "virjson.h"
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 5a80015..6071cdf 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "qemu_capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
#include "util.h"
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 80ceee5..de4a5be 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -28,7 +28,7 @@
#include "qemu_process.h"
#include "vircgroup.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "util.h"
#include "domain_audit.h"
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 14ab29f..a3d1ddb 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -28,7 +28,7 @@
#include "qemu_capabilities.h"
#include "qemu_bridge_filter.h"
#include "cpu/cpu.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
#include "util.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 2073fd5..9e0789f 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -43,7 +43,7 @@
#include "virbuffer.h"
#include "virconf.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "datatypes.h"
#include "xml.h"
#include "nodeinfo.h"
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e6eaa58..8dcadbc 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -27,7 +27,7 @@
#include "qemu_command.h"
#include "qemu_capabilities.h"
#include "qemu_migration.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
#include "c-ctype.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4d81a73..d97fc16 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -66,7 +66,7 @@
#include "nodeinfo.h"
#include "stats_linux.h"
#include "capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "domain_conf.h"
#include "domain_audit.h"
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 94b5ae0..051f0d9 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -26,7 +26,7 @@
#include "qemu_hostdev.h"
#include "virlog.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "pci.h"
#include "virusb.h"
#include "virnetdev.h"
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index f8420c4..37e3ada 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -35,7 +35,7 @@
#include "virlog.h"
#include "datatypes.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "pci.h"
#include "virfile.h"
#include "qemu_cgroup.h"
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 4248298..ff453be 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -38,7 +38,7 @@
#include "domain_audit.h"
#include "virlog.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virfile.h"
#include "datatypes.h"
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 920453d..5ca1f89 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -32,7 +32,7 @@
#include "qemu_monitor_text.h"
#include "qemu_monitor_json.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
#include "virprocess.h"
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index e14134b..0137291 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -35,7 +35,7 @@
#include "qemu_monitor_json.h"
#include "qemu_command.h"
#include "qemu_capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "driver.h"
#include "datatypes.h"
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 28690b1..82e9108 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -34,7 +34,7 @@
#include "qemu_command.h"
#include "c-ctype.h"
#include "c-strcasestr.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "driver.h"
#include "datatypes.h"
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 00ff243..c43c968 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -53,7 +53,7 @@
#include "datatypes.h"
#include "virlog.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virhook.h"
#include "virfile.h"
#include "virpidfile.h"
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 1e9151a..2edf6e6 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -38,7 +38,7 @@
#include "remote_driver.h"
#include "remote_protocol.h"
#include "qemu_protocol.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virfile.h"
#include "vircommand.h"
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 8fc1cba..91af315 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -22,7 +22,7 @@
#include <config.h>
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "virfile.h"
#include "virlog.h"
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 7370ae0..b4fe4d9 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -30,7 +30,7 @@
#include "virnetclient.h"
#include "virnetsocket.h"
#include "virkeepalive.h"
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "virfile.h"
#include "virlog.h"
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index dec3943..7396971 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -28,7 +28,7 @@
#include "virnetclient.h"
#include "virnetprotocol.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "util.h"
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 26dc292..4877b0c 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -24,7 +24,7 @@
#include "virnetclientstream.h"
#include "virnetclient.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "threads.h"
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index 16d8e61..f273811 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include "virnetmessage.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index e880127..adc4f1e 100644
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -26,7 +26,7 @@
#include "virnetmessage.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "virlog.h"
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 6d3532a..67cd4b5 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -29,7 +29,7 @@
#include "virnetserver.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "threads.h"
#include "threadpool.h"
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 9642ea5..7f028b8 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -31,7 +31,7 @@
#include "virlog.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "virkeepalive.h"
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index c17b65d..daef2b4 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -42,7 +42,7 @@
#include "virnetservermdns.h"
#include "vireventpoll.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index 5b96c34..287282e 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -26,7 +26,7 @@
#include "virnetserverprogram.h"
#include "virnetserverclient.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index a9362ad..92b5cef 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -25,7 +25,7 @@
#include "virnetserverservice.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "threads.h"
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index aa8f4b9..8c62a2a 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -42,7 +42,7 @@
#include "c-ctype.h"
#include "virnetsocket.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 734acaa..8a7d5f9 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -27,7 +27,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "configmake.h"
#include "threads.h"
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 2931003..d9354e0 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -30,7 +30,7 @@
#include "virnettlscontext.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "util.h"
#include "virlog.h"
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 4159358..fb2024b 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -33,7 +33,7 @@
#include "datatypes.h"
#include "driver.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "secret_conf.h"
#include "secret_driver.h"
#include "threads.h"
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 9262091..b2678ca 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -39,7 +39,7 @@
#include "security_apparmor.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "datatypes.h"
#include "uuid.h"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 931ae4e..7084e33 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -26,7 +26,7 @@
#include "security_dac.h"
#include "virterror_internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "pci.h"
#include "virusb.h"
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index c675715..d6a3f64 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -27,7 +27,7 @@
#include "security_stack.h"
#include "security_dac.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 11f839f..ad43bc8 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -35,7 +35,7 @@
#include "security_selinux.h"
#include "virterror_internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "pci.h"
#include "virusb.h"
diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 65d4240..3412372 100644
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -23,7 +23,7 @@
#include "security_stack.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 8553e87..6f73c66 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -42,7 +42,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "vircommand.h"
#include "security_driver.h"
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 899caeb..cdc5bda 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -48,7 +48,7 @@
#include "datatypes.h"
#include "virterror_internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "internal.h"
#include "secret_conf.h"
#include "uuid.h"
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 7e1d3ec..8759b3a 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -30,7 +30,7 @@
#include "virlog.h"
#include "storage_backend_disk.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "vircommand.h"
#include "configmake.h"
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 78b50f0..f7b4656 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -46,7 +46,7 @@
#include "storage_conf.h"
#include "storage_file.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "xml.h"
#include "virfile.h"
#include "virlog.h"
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index 46659af..ecb8f8e 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -38,7 +38,7 @@
#include "storage_backend_scsi.h"
#include "storage_backend_iscsi.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
#include "vircommand.h"
diff --git a/src/storage/storage_backend_logical.c
b/src/storage/storage_backend_logical.c
index f28c663..83b517c 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -35,7 +35,7 @@
#include "storage_backend_logical.h"
#include "storage_conf.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index 1ca120f..0e5d032 100644
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -32,7 +32,7 @@
#include "virterror_internal.h"
#include "storage_conf.h"
#include "storage_backend.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 4e58911..e1f07ab 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -26,7 +26,7 @@
#include "storage_backend_rbd.h"
#include "storage_conf.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "base64.h"
#include "uuid.h"
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 32713be..1db8fdd 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -30,7 +30,7 @@
#include "virterror_internal.h"
#include "storage_backend_scsi.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
#include "vircommand.h"
diff --git a/src/storage/storage_backend_sheepdog.c
b/src/storage/storage_backend_sheepdog.c
index 05deeeb..d3b9d87 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -31,7 +31,7 @@
#include "storage_conf.h"
#include "vircommand.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 6076f6c..aebf8bb 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -42,7 +42,7 @@
#include "util.h"
#include "storage_driver.h"
#include "storage_conf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "storage_backend.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 8dd5694..0856cdb 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -39,7 +39,7 @@
#include "util.h"
#include "uuid.h"
#include "capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
#include "network_conf.h"
#include "interface_conf.h"
#include "domain_conf.h"
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 6b14f23..496f279 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -39,7 +39,7 @@
#include "virbuffer.h"
#include "virconf.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "nodeinfo.h"
#include "virlog.h"
#include "domain_nwfilter.h"
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 90c9b66..cece114 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -51,7 +51,7 @@
#include "nodeinfo.h"
#include "stats_linux.h"
#include "capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
#include "uuid.h"
#include "domain_conf.h"
#include "domain_audit.h"
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index a9c8b4c..1b16d5c 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -36,7 +36,7 @@
#include "util.h"
#include "threads.h"
#include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "configmake.h"
#include "virrandom.h"
diff --git a/src/util/pci.c b/src/util/pci.c
index 7adce75..e4009fa 100644
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "vircommand.h"
#include "virterror_internal.h"
#include "virfile.h"
diff --git a/src/util/sexpr.c b/src/util/sexpr.c
index f72b7d7..ae0cc18 100644
--- a/src/util/sexpr.c
+++ b/src/util/sexpr.c
@@ -20,7 +20,7 @@
#include "virterror_internal.h"
#include "sexpr.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_SEXPR
diff --git a/src/util/stats_linux.c b/src/util/stats_linux.c
index 2dfc30d..67ef82e 100644
--- a/src/util/stats_linux.c
+++ b/src/util/stats_linux.c
@@ -36,7 +36,7 @@
# include "datatypes.h"
# include "util.h"
# include "stats_linux.h"
-# include "memory.h"
+# include "viralloc.h"
# include "virfile.h"
# define VIR_FROM_THIS VIR_FROM_STATS_LINUX
diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index 6c3390b..a020bb2 100644
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -35,7 +35,7 @@
# include <sys/statfs.h>
#endif
#include "dirname.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index f07c2d8..6da87ce 100644
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -34,7 +34,7 @@
#include "sysinfo.h"
#include "util.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "vircommand.h"
#define VIR_FROM_THIS VIR_FROM_SYSINFO
diff --git a/src/util/threadpool.c b/src/util/threadpool.c
index ffbbe72..9d3d5d2 100644
--- a/src/util/threadpool.c
+++ b/src/util/threadpool.c
@@ -26,7 +26,7 @@
#include <config.h>
#include "threadpool.h"
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "virterror_internal.h"
diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c
index 44e8bc0..37d8902 100644
--- a/src/util/threads-pthread.c
+++ b/src/util/threads-pthread.c
@@ -27,7 +27,7 @@
# include <sys/syscall.h>
#endif
-#include "memory.h"
+#include "viralloc.h"
/* Nothing special required for pthreads */
diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c
index 142aa4f..c9f16c1 100644
--- a/src/util/threads-win32.c
+++ b/src/util/threads-win32.c
@@ -23,7 +23,7 @@
#include <process.h>
-#include "memory.h"
+#include "viralloc.h"
struct virThreadLocalData {
DWORD key;
diff --git a/src/util/util.c b/src/util/util.c
index f941dfd..c070d94 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -80,7 +80,7 @@
#include "virbuffer.h"
#include "util.h"
#include "storage_file.h"
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "verify.h"
#include "virfile.h"
diff --git a/src/util/uuid.c b/src/util/uuid.c
index 6efc7be..5232ba9 100644
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -38,7 +38,7 @@
#include "util.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#include "virrandom.h"
diff --git a/src/util/memory.c b/src/util/viralloc.c
similarity index 99%
rename from src/util/memory.c
rename to src/util/viralloc.c
index 186d3b6..628145f 100644
--- a/src/util/memory.c
+++ b/src/util/viralloc.c
@@ -23,7 +23,7 @@
#include <config.h>
#include <stdlib.h>
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#if TEST_OOM
diff --git a/src/util/memory.h b/src/util/viralloc.h
similarity index 100%
rename from src/util/memory.h
rename to src/util/viralloc.h
diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index c4e0129..a807b76 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -32,7 +32,7 @@
#include "viraudit.h"
#include "util.h"
#include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
/* Provide the macros in case the header file is old.
FIXME: should be removed. */
diff --git a/src/util/virauth.c b/src/util/virauth.c
index a1bad6a..c4c5676 100644
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -26,7 +26,7 @@
#include "virauth.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "datatypes.h"
#include "virterror_internal.h"
diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 46ba040..a0f0be5 100644
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -25,7 +25,7 @@
#include "virauthconfig.h"
#include "virkeyfile.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index 41b74d4..cb9606b 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -31,7 +31,7 @@
#include <sys/types.h>
#include "virbitmap.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virbuffer.h"
#include "util.h"
#include "c-ctype.h"
diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index e4409c6..6fcb7d6 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -31,7 +31,7 @@
#define __VIR_BUFFER_C__
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
/* If adding more fields, ensure to edit buf.h to match
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 82e6613..5c628cc 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -39,7 +39,7 @@
#include "internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "vircgroup.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 7bed04e..6e17a8d 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -34,7 +34,7 @@
#endif
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "util.h"
#include "virlog.h"
diff --git a/src/util/virconf.c b/src/util/virconf.c
index c12a0bb..2f6d60e 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -36,7 +36,7 @@
#include "util.h"
#include "c-ctype.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_CONF
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index b6c6642..34c46b2 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "virdbus.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "threads.h"
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index d660c27..67ffa4d 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -43,7 +43,7 @@
#include "virdnsmasq.h"
#include "util.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index 8333c38..1beb085 100644
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -42,7 +42,7 @@
#include "internal.h"
#include "virebtables.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "threads.h"
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index 0256d83..cf4dc41 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -34,7 +34,7 @@
#include "threads.h"
#include "virlog.h"
#include "vireventpoll.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virfile.h"
#include "virterror_internal.h"
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 30294a2..f20ce64 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -39,7 +39,7 @@
#include "vircommand.h"
#include "configmake.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/util/virhash.c b/src/util/virhash.c
index 077abca..a1234c4 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -26,7 +26,7 @@
#include "virterror_internal.h"
#include "virhash.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virhashcode.h"
#include "virrandom.h"
diff --git a/src/util/virhook.c b/src/util/virhook.c
index d8969ad..8a741de 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -34,7 +34,7 @@
#include "virhook.h"
#include "util.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#include "configmake.h"
#include "vircommand.h"
diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index e8949af..91a948f 100644
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -30,7 +30,7 @@
#include "virinitctl.h"
#include "virterror_internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_INITCTL
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index ee3e9a0..178580d 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -40,7 +40,7 @@
#include "internal.h"
#include "viriptables.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "threads.h"
diff --git a/src/util/virjson.c b/src/util/virjson.c
index 18a28ba..4fa5363 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "virjson.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "util.h"
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index b43b92d..fc61cf5 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -27,7 +27,7 @@
#include "c-ctype.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virhash.h"
#include "virkeyfile.h"
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index b652294..509b162 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -23,7 +23,7 @@
#include "virlockspace.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "util.h"
#include "virfile.h"
diff --git a/src/util/virlog.c b/src/util/virlog.c
index d179de2..cb15a22 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -42,7 +42,7 @@
#include "virterror_internal.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virbuffer.h"
#include "threads.h"
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index a1d1c12..88a2e4b 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -27,7 +27,7 @@
#include "virfile.h"
#include "virterror_internal.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "pci.h"
#include "virlog.h"
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index bd75a9d..9cc8858 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -24,7 +24,7 @@
#include "virnetdevbandwidth.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 2c4a9eb..eb341a2 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -26,7 +26,7 @@
#include "virterror_internal.h"
#include "util.h"
#include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
#include "intprops.h"
#include <sys/ioctl.h>
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 8d2574c..0f7107b 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -56,7 +56,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
# define MACVLAN_MODE_PASSTHRU 8
# endif
-# include "memory.h"
+# include "viralloc.h"
# include "virlog.h"
# include "uuid.h"
# include "virfile.h"
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index 983a240..b876a4e 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -25,7 +25,7 @@
#include "virnetdevopenvswitch.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#include "virmacaddr.h"
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 644e9a4..339d636 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -30,7 +30,7 @@
#include "virterror_internal.h"
#include "virfile.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "util.h"
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index 630b7c9..c6568b7 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -26,7 +26,7 @@
#include <sys/wait.h>
#include "virnetdevveth.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "vircommand.h"
#include "virterror_internal.h"
diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c
index 7a6ff9b..53c6b65 100644
--- a/src/util/virnetdevvlan.c
+++ b/src/util/virnetdevvlan.c
@@ -24,7 +24,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "virnetdevvlan.h"
-#include "memory.h"
+#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 834b9b9..60acabd 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -24,7 +24,7 @@
#include "virnetdevvportprofile.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_NET
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 830e9b9..b132d9a 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -37,7 +37,7 @@
#include "virnetlink.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "virmacaddr.h"
#include "virterror_internal.h"
diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index e37a2d6..1528cf1 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -26,7 +26,7 @@
#include "threads.h"
#include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/util/virobject.c b/src/util/virobject.c
index aa80cab..5cdd2e8 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -23,7 +23,7 @@
#include "virobject.h"
#include "threads.h"
-#include "memory.h"
+#include "viralloc.h"
#include "viratomic.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 6ec9760..3b3322b 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -29,7 +29,7 @@
#include "virpidfile.h"
#include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "intprops.h"
#include "virlog.h"
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 3c0ed8a..8070b8b 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -28,7 +28,7 @@
#include "virprocess.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "util.h"
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 228c3fb..5607b3e 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "virstring.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virbuffer.h"
#include "virterror_internal.h"
diff --git a/src/util/virterror.c b/src/util/virterror.c
index 6e3301b..ce2d837 100644
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -30,7 +30,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "util.h"
diff --git a/src/util/virtime.c b/src/util/virtime.c
index a2610c4..f9fc282 100644
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -38,7 +38,7 @@
#include "virtime.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index 7f0a44b..e08530e 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -24,7 +24,7 @@
#include <stdarg.h>
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virterror_internal.h"
diff --git a/src/util/viruri.c b/src/util/viruri.c
index dd3b878..f48079d 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -22,7 +22,7 @@
#include "viruri.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virterror_internal.h"
#include "virbuffer.h"
diff --git a/src/util/virusb.c b/src/util/virusb.c
index d980026..154965e 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -33,7 +33,7 @@
#include "virusb.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virterror_internal.h"
diff --git a/src/util/xml.c b/src/util/xml.c
index 5b08b1f..caf26a3 100644
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -34,7 +34,7 @@
#include "xml.h"
#include "virbuffer.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_XML
diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index 3194b7c..cab4398 100644
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -30,7 +30,7 @@
#define nsCID CLSID
#include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 5f70283..5296127 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -37,7 +37,7 @@
#include "vbox_XPCOMCGlue.h"
#include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 3a45646..e39a9de 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -49,7 +49,7 @@
#include "storage_conf.h"
#include "storage_file.h"
#include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
#include "nodeinfo.h"
#include "virlog.h"
#include "vbox_driver.h"
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index f82fcb3..6c8e924 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -26,7 +26,7 @@
#include "vircommand.h"
#include "cpu/cpu.h"
#include "dirname.h"
-#include "memory.h"
+#include "viralloc.h"
#include "nodeinfo.h"
#include "virfile.h"
#include "uuid.h"
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index d9a1333..233804e 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -27,7 +27,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "uuid.h"
#include "vircommand.h"
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index e34e15e..4d55f0b 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "vmx.h"
diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index e50b5ff..126283b 100644
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -42,7 +42,7 @@
# include "datatypes.h"
# include "util.h"
# include "block_stats.h"
-# include "memory.h"
+# include "viralloc.h"
# include "virfile.h"
# define VIR_FROM_THIS VIR_FROM_STATS_LINUX
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index c281c00..94df116 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -55,7 +55,7 @@
#endif
#include "xml.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "node_device_conf.h"
#include "pci.h"
#include "uuid.h"
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index d6d3874..1837888 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -75,7 +75,7 @@
#include "xend_internal.h"
#include "virbuffer.h"
#include "capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
#include "threads.h"
#include "virfile.h"
#include "virnodesuspend.h"
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 073663f..35a625c 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -30,7 +30,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "driver.h"
-#include "memory.h"
+#include "viralloc.h"
#include "xen_driver.h"
#include "virconf.h"
#include "domain_conf.h"
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 0364f84..a4005f4 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -42,7 +42,7 @@
#include "xen_driver.h"
#include "xen_hypervisor.h"
#include "xs_internal.h" /* To extract VNC port & Serial console TTY */
-#include "memory.h"
+#include "viralloc.h"
#include "count-one-bits.h"
#include "virfile.h"
#include "viruri.h"
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index fc7b581..2109972 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -46,7 +46,7 @@
#include "virbuffer.h"
#include "uuid.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "count-one-bits.h"
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 4cc82d8..e414966 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -44,7 +44,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "driver.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
#include "xen_driver.h"
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 502c653..d49181c 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -33,7 +33,7 @@
#include "virauth.h"
#include "util.h"
#include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virbuffer.h"
#include "viruri.h"
#include "xenapi_driver.h"
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 6f51100..33aa4d7 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -31,7 +31,7 @@
#include "datatypes.h"
#include "util.h"
#include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virbuffer.h"
#include "virlog.h"
#include "viruri.h"
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 2aa384d..0cbc248 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -29,7 +29,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "verify.h"
#include "uuid.h"
#include "virlog.h"
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 5e284df..8a64aad 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
#include "verify.h"
#include "uuid.h"
#include "sexpr.h"
diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index 2100aa0..3c7fef5 100644
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#include "testutils.h"
diff --git a/tests/commandtest.c b/tests/commandtest.c
index f76bc54..b15c168 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -32,7 +32,7 @@
#include "internal.h"
#include "nodeinfo.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "vircommand.h"
#include "virfile.h"
#include "virpidfile.h"
diff --git a/tests/conftest.c b/tests/conftest.c
index aacc526..d5467e8 100644
--- a/tests/conftest.c
+++ b/tests/conftest.c
@@ -6,7 +6,7 @@
#include <string.h>
#include <errno.h>
#include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
int main(int argc, char **argv)
{
diff --git a/tests/cputest.c b/tests/cputest.c
index 4a54c9f..6299409 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -32,7 +32,7 @@
#include "internal.h"
#include "xml.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virbuffer.h"
#include "testutils.h"
#include "cpu_conf.h"
diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index 201b930..b65009b 100644
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -7,7 +7,7 @@
# include <unistd.h>
# include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
# include "testutils.h"
# include "util.h"
# include "vmx/vmx.h"
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index dc0e064..3979540 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -12,7 +12,7 @@
#include "testutils.h"
#include "network_conf.h"
#include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
#include "network/bridge_driver.h"
static int
diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index 305c7b1..80701a2 100644
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -7,7 +7,7 @@
# include <unistd.h>
# include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
# include "testutils.h"
# include "util.h"
# include "openvz/openvz_conf.h"
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index caa7d64..252ad3a 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -7,7 +7,7 @@
# include "testutils.h"
# include "qemu/qemu_capabilities.h"
-# include "memory.h"
+# include "viralloc.h"
struct testInfo {
const char *name;
diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c
index 82f861b..21a6828 100644
--- a/tests/qemumonitortest.c
+++ b/tests/qemumonitortest.c
@@ -8,7 +8,7 @@
#ifdef WITH_QEMU
# include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
# include "testutils.h"
# include "util.h"
# include "qemu/qemu_monitor.h"
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index e4194de..1e3f0da 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -29,7 +29,7 @@
#include "threads.h"
#include "qemu/qemu_monitor.h"
#include "rpc/virnetsocket.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1555b6e..9e2c4e4 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -12,7 +12,7 @@
# include "internal.h"
# include "testutils.h"
-# include "util/memory.h"
+# include "viralloc.h"
# include "qemu/qemu_capabilities.h"
# include "qemu/qemu_command.h"
# include "qemu/qemu_domain.h"
diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index f8a2481..0e4959e 100644
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -30,7 +30,7 @@
#include "internal.h"
#include "testutils.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/tests/sockettest.c b/tests/sockettest.c
index c6a175f..156ef45 100644
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -28,7 +28,7 @@
#include "virsocketaddr.h"
#include "testutils.h"
#include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
static void testQuietError(void *userData ATTRIBUTE_UNUSED,
virErrorPtr error ATTRIBUTE_UNUSED)
diff --git a/tests/testutils.c b/tests/testutils.c
index 96e24d4..7bb88f0 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -39,7 +39,7 @@
#include <limits.h>
#include "testutils.h"
#include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "threads.h"
#include "virterror_internal.h"
diff --git a/tests/testutils.h b/tests/testutils.h
index 82837ab..581bd3e 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -24,7 +24,7 @@
# define __VIT_TEST_UTILS_H__
# include <stdio.h>
-# include "memory.h"
+# include "viralloc.h"
# define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */
# define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */
diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c
index ea2a558..b0a2580 100644
--- a/tests/testutilslxc.c
+++ b/tests/testutilslxc.c
@@ -4,7 +4,7 @@
# include "testutilslxc.h"
# include "testutils.h"
-# include "memory.h"
+# include "viralloc.h"
# include "domain_conf.h"
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 2ad9b2e..573927d 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -4,7 +4,7 @@
# include "testutilsqemu.h"
# include "testutils.h"
-# include "memory.h"
+# include "viralloc.h"
# include "cpu_conf.h"
# include "qemu/qemu_driver.h"
# include "qemu/qemu_domain.h"
diff --git a/tests/utiltest.c b/tests/utiltest.c
index 774a2f7..4fbb25c 100644
--- a/tests/utiltest.c
+++ b/tests/utiltest.c
@@ -6,7 +6,7 @@
#include <unistd.h>
#include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "testutils.h"
#include "util.h"
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 74cc187..9e7dac5 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -26,7 +26,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virauthconfig.h"
diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index 53b9bbe..ec93939 100644
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -8,7 +8,7 @@
#include "util.h"
#include "testutils.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#define TEST_ERROR(...) \
do { \
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 440ee8e..e06179f 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -23,7 +23,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "driver.h"
diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index 7de16d0..a2a40c6 100644
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -9,7 +9,7 @@
#include "virhash.h"
#include "virhashdata.h"
#include "testutils.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virlog.h"
diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index c6aca86..ad5a516 100644
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -26,7 +26,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virkeyfile.h"
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index c95f5d8..80478d9 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -27,7 +27,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virlockspace.h"
diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index c20f5e6..e3517e8 100644
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -26,7 +26,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "rpc/virnetmessage.h"
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index ba281e9..399c4fd 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -30,7 +30,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index 0236659..27078ea 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -29,7 +29,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
#include "vircommand.h"
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 27e490f..a8f4c79 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -25,7 +25,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virstring.h"
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index c8e9a2e..7d7a2d6 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -26,7 +26,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "virtime.h"
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 46964b3..57d3895 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -26,7 +26,7 @@
#include "testutils.h"
#include "util.h"
#include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virlog.h"
#include "viruri.h"
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index c44e61f..03a8989 100644
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -7,7 +7,7 @@
# include <unistd.h>
# include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
# include "testutils.h"
# include "vmx/vmx.h"
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 3de68fd..a3943e2 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -34,7 +34,7 @@
#include "xenxs/xen_xm.h"
#include "testutils.h"
#include "testutilsxen.h"
-#include "memory.h"
+#include "viralloc.h"
static virCapsPtr caps;
diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index 334f321..653ab6c 100644
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -7,7 +7,7 @@
# include <unistd.h>
# include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
# include "testutils.h"
# include "vmx/vmx.h"
diff --git a/tools/console.c b/tools/console.c
index dbdaab7..1d21189 100644
--- a/tools/console.c
+++ b/tools/console.c
@@ -41,7 +41,7 @@
# include "virlog.h"
# include "util.h"
# include "virfile.h"
-# include "memory.h"
+# include "viralloc.h"
# include "threads.h"
# include "virterror_internal.h"
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 0006c11..a443988 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "conf/domain_conf.h"
#include "intprops.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virmacaddr.h"
#include "virsh-domain.h"
#include "xml.h"
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 76d9d51..b0b0c94 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -42,7 +42,7 @@
#include "c-ctype.h"
#include "conf/domain_conf.h"
#include "console.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virfile.h"
#include "virkeycode.h"
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 6f129d1..2d59a75 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virsh-domain.h"
#include "xml.h"
diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 956fee8..40216c6 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index c5d494a..66ee7e3 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "xml.h"
#include "conf/network_conf.h"
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 52cd874..7e569b3 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "xml.h"
#include "conf/node_device_conf.h"
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 3108d1b..c3dba0c 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 4a78467..6e29604 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -33,7 +33,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "xml.h"
#include "conf/storage_conf.h"
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index ee79b97..d81e8ce 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "base64.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "xml.h"
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index d6a381d..3fecde6 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -35,7 +35,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virsh-domain.h"
#include "xml.h"
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 1bad6b1..ebfe52d 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -35,7 +35,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
#include "util.h"
#include "virfile.h"
#include "virsh-pool.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 5cb2e06..e894aff 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -59,7 +59,7 @@
#include "virbuffer.h"
#include "console.h"
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "xml.h"
#include "libvirt/libvirt-qemu.h"
#include "virfile.h"
diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index 5bbb5e9..cd75eba 100644
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -28,7 +28,7 @@
#include <sys/utsname.h>
#include "util.h"
-#include "memory.h"
+#include "viralloc.h"
#include "virfile.h"
#include "virt-host-validate-common.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 16/28] Rename pci.{c,h} to virpci.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/conf/node_device_conf.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/node_device/node_device_hal.c | 2 +-
src/node_device/node_device_udev.c | 2 +-
src/qemu/qemu_conf.h | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hostdev.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/security/security_apparmor.c | 2 +-
src/security/security_dac.c | 2 +-
src/security/security_selinux.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/util/virnetdev.c | 2 +-
src/util/virnetdev.h | 2 +-
src/util/{pci.c => virpci.c} | 2 +-
src/util/{pci.h => virpci.h} | 0
src/xen/xen_driver.c | 2 +-
19 files changed, 18 insertions(+), 18 deletions(-)
rename src/util/{pci.c => virpci.c} (99%)
rename src/util/{pci.h => virpci.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e39a4ef..5eab6a8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/pci.c
src/util/processinfo.c
src/util/sexpr.c
src/util/stats_linux.c
@@ -172,6 +171,7 @@ src/util/virnetdevtap.c
src/util/virnetdevvportprofile.c
src/util/virnetlink.c
src/util/virnodesuspend.c
+src/util/virpci.c
src/util/virpidfile.c
src/util/virprocess.c
src/util/virrandom.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 25c7cca..fbcb208 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/pci.c util/pci.h \
util/processinfo.c util/processinfo.h \
util/sexpr.c util/sexpr.h \
util/stats_linux.c util/stats_linux.h \
@@ -86,6 +85,7 @@ UTIL_SOURCES = \
util/virjson.c util/virjson.h \
util/virlog.c util/virlog.h \
util/virobject.c util/virobject.h \
+ util/virpci.c util/virpci.h \
util/virpidfile.c util/virpidfile.h \
util/virprocess.c util/virprocess.h \
util/virtypedparam.c util/virtypedparam.h \
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 85de50f..045f05d 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -36,7 +36,7 @@
#include "util.h"
#include "virbuffer.h"
#include "uuid.h"
-#include "pci.h"
+#include "virpci.h"
#include "virrandom.h"
#define VIR_FROM_THIS VIR_FROM_NODEDEV
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 2265e5f..90beb7e 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -61,7 +61,7 @@
#include "virdnsmasq.h"
#include "configmake.h"
#include "virnetdev.h"
-#include "pci.h"
+#include "virpci.h"
#include "virnetdevbridge.h"
#include "virnetdevtap.h"
#include "virnetdevvportprofile.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 6f89f16..257a363 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -35,7 +35,7 @@
#include "datatypes.h"
#include "viralloc.h"
#include "uuid.h"
-#include "pci.h"
+#include "virpci.h"
#include "virlog.h"
#include "node_device_driver.h"
#include "virdbus.h"
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 81a11d7..7289a72 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -37,7 +37,7 @@
#include "uuid.h"
#include "util.h"
#include "virbuffer.h"
-#include "pci.h"
+#include "virpci.h"
#define VIR_FROM_THIS VIR_FROM_NODEDEV
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 283251a..f928c29 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -35,7 +35,7 @@
# include "threads.h"
# include "security/security_manager.h"
# include "vircgroup.h"
-# include "pci.h"
+# include "virpci.h"
# include "virusb.h"
# include "cpu_conf.h"
# include "driver.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d97fc16..677352d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -71,7 +71,7 @@
#include "domain_conf.h"
#include "domain_audit.h"
#include "node_device_conf.h"
-#include "pci.h"
+#include "virpci.h"
#include "virusb.h"
#include "processinfo.h"
#include "libvirt_internal.h"
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 051f0d9..307f3e0 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -27,7 +27,7 @@
#include "virlog.h"
#include "virterror_internal.h"
#include "viralloc.h"
-#include "pci.h"
+#include "virpci.h"
#include "virusb.h"
#include "virnetdev.h"
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 37e3ada..4874062 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -36,7 +36,7 @@
#include "datatypes.h"
#include "virterror_internal.h"
#include "viralloc.h"
-#include "pci.h"
+#include "virpci.h"
#include "virfile.h"
#include "qemu_cgroup.h"
#include "locking/domain_lock.h"
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index b2678ca..d9699e2 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -43,7 +43,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "uuid.h"
-#include "pci.h"
+#include "virpci.h"
#include "virusb.h"
#include "virfile.h"
#include "configmake.h"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 7084e33..862e590 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -28,7 +28,7 @@
#include "util.h"
#include "viralloc.h"
#include "virlog.h"
-#include "pci.h"
+#include "virpci.h"
#include "virusb.h"
#include "storage_file.h"
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index ad43bc8..46c92ca 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -37,7 +37,7 @@
#include "util.h"
#include "viralloc.h"
#include "virlog.h"
-#include "pci.h"
+#include "virpci.h"
#include "virusb.h"
#include "storage_file.h"
#include "virfile.h"
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 6f73c66..81f36ba 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -51,7 +51,7 @@
#include "xml.h"
#include "uuid.h"
#include "virusb.h"
-#include "pci.h"
+#include "virpci.h"
#include "virfile.h"
#include "configmake.h"
#include "virrandom.h"
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 88a2e4b..3ea0e39 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -28,7 +28,7 @@
#include "virterror_internal.h"
#include "vircommand.h"
#include "viralloc.h"
-#include "pci.h"
+#include "virpci.h"
#include "virlog.h"
#include <sys/ioctl.h>
diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 123667c..d588e89 100644
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -26,7 +26,7 @@
# include "virsocketaddr.h"
# include "virnetlink.h"
# include "virmacaddr.h"
-# include "pci.h"
+# include "virpci.h"
int virNetDevExists(const char *brname)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
diff --git a/src/util/pci.c b/src/util/virpci.c
similarity index 99%
rename from src/util/pci.c
rename to src/util/virpci.c
index e4009fa..8875aa6 100644
--- a/src/util/pci.c
+++ b/src/util/virpci.c
@@ -21,7 +21,7 @@
#include <config.h>
-#include "pci.h"
+#include "virpci.h"
#include <dirent.h>
#include <fcntl.h>
diff --git a/src/util/pci.h b/src/util/virpci.h
similarity index 100%
rename from src/util/pci.h
rename to src/util/virpci.h
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 94df116..9b2fcf3 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -57,7 +57,7 @@
#include "util.h"
#include "viralloc.h"
#include "node_device_conf.h"
-#include "pci.h"
+#include "virpci.h"
#include "uuid.h"
#include "fdstream.h"
#include "virfile.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 17/28] Merge processinfo.{c, h} into virprocess.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 1 -
src/Makefile.am | 1 -
src/libvirt_private.syms | 7 +-
src/lxc/lxc_controller.c | 3 +-
src/qemu/qemu_driver.c | 14 ++--
src/qemu/qemu_process.c | 9 +--
src/util/processinfo.c | 189 -----------------------------------------------
src/util/processinfo.h | 34 ---------
src/util/virprocess.c | 161 ++++++++++++++++++++++++++++++++++++++++
src/util/virprocess.h | 6 ++
10 files changed, 181 insertions(+), 244 deletions(-)
delete mode 100644 src/util/processinfo.c
delete mode 100644 src/util/processinfo.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5eab6a8..2dc72f6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/processinfo.c
src/util/sexpr.c
src/util/stats_linux.c
src/util/storage_file.c
diff --git a/src/Makefile.am b/src/Makefile.am
index fbcb208..cbdfc45 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/processinfo.c util/processinfo.h \
util/sexpr.c util/sexpr.h \
util/stats_linux.c util/stats_linux.h \
util/storage_file.c util/storage_file.h \
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index bf7f65b..497d5d3 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1028,11 +1028,6 @@ pciResetDevice;
pciWaitForDeviceCleanup;
-# processinfo.h
-virProcessInfoGetAffinity;
-virProcessInfoSetAffinity;
-
-
# secret_conf.h
virSecretDefFormat;
virSecretDefFree;
@@ -1794,8 +1789,10 @@ virPidFileWritePath;
# virprocess.h
virProcessAbort;
+virProcessGetAffinity;
virProcessKill;
virProcessKillPainfully;
+virProcessSetAffinity;
virProcessTranslateStatus;
virProcessWait;
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 4520a5f..8283c8f 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -67,7 +67,6 @@
#include "virfile.h"
#include "virpidfile.h"
#include "vircommand.h"
-#include "processinfo.h"
#include "nodeinfo.h"
#include "virrandom.h"
#include "virprocess.h"
@@ -541,7 +540,7 @@ static int virLXCControllerSetupCpuAffinity(virLXCControllerPtr ctrl)
* so use '0' to indicate our own process ID. No threads are
* running at this point
*/
- if (virProcessInfoSetAffinity(0 /* Self */, cpumapToSet) < 0) {
+ if (virProcessSetAffinity(0 /* Self */, cpumapToSet) < 0) {
virBitmapFree(cpumap);
return -1;
}
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 677352d..02dd77b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -73,7 +73,7 @@
#include "node_device_conf.h"
#include "virpci.h"
#include "virusb.h"
-#include "processinfo.h"
+#include "virprocess.h"
#include "libvirt_internal.h"
#include "xml.h"
#include "cpu/cpu.h"
@@ -3880,8 +3880,8 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver,
goto cleanup;
}
} else {
- if (virProcessInfoSetAffinity(cpupids[i],
- vcpupin->cpumask) < 0) {
+ if (virProcessSetAffinity(cpupids[i],
+ vcpupin->cpumask) < 0) {
virReportError(VIR_ERR_SYSTEM_ERROR,
_("failed to set cpu affinity for vcpu
%d"),
i);
@@ -4154,7 +4154,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
goto cleanup;
}
} else {
- if (virProcessInfoSetAffinity(priv->vcpupids[vcpu], pcpumap) < 0) {
+ if (virProcessSetAffinity(priv->vcpupids[vcpu], pcpumap) < 0) {
virReportError(VIR_ERR_SYSTEM_ERROR,
_("failed to set cpu affinity for vcpu %d"),
vcpu);
@@ -4422,7 +4422,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
}
}
} else {
- if (virProcessInfoSetAffinity(pid, pcpumap) < 0) {
+ if (virProcessSetAffinity(pid, pcpumap) < 0) {
virReportError(VIR_ERR_SYSTEM_ERROR, "%s",
_("failed to set cpu affinity for "
"emulator threads"));
@@ -4640,8 +4640,8 @@ qemuDomainGetVcpus(virDomainPtr dom,
unsigned char *tmpmap = NULL;
int tmpmapLen = 0;
- if (virProcessInfoGetAffinity(priv->vcpupids[v],
- &map, maxcpu) < 0)
+ if (virProcessGetAffinity(priv->vcpupids[v],
+ &map, maxcpu) < 0)
goto cleanup;
virBitmapToData(map, &tmpmap, &tmpmapLen);
if (tmpmapLen > maplen)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index c43c968..0e823bd 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -60,7 +60,6 @@
#include "util.h"
#include "c-ctype.h"
#include "nodeinfo.h"
-#include "processinfo.h"
#include "domain_audit.h"
#include "domain_nwfilter.h"
#include "locking/domain_lock.h"
@@ -1980,7 +1979,7 @@ qemuProcessInitCpuAffinity(virQEMUDriverPtr driver,
* so use '0' to indicate our own process ID. No threads are
* running at this point
*/
- if (virProcessInfoSetAffinity(0 /* Self */, cpumapToSet) < 0)
+ if (virProcessSetAffinity(0 /* Self */, cpumapToSet) < 0)
goto cleanup;
ret = 0;
@@ -2045,8 +2044,8 @@ qemuProcessSetVcpuAffinities(virConnectPtr conn ATTRIBUTE_UNUSED,
for (n = 0; n < def->cputune.nvcpupin; n++) {
vcpu = def->cputune.vcpupin[n]->vcpuid;
- if (virProcessInfoSetAffinity(priv->vcpupids[vcpu],
- def->cputune.vcpupin[n]->cpumask) < 0) {
+ if (virProcessSetAffinity(priv->vcpupids[vcpu],
+ def->cputune.vcpupin[n]->cpumask) < 0) {
goto cleanup;
}
}
@@ -2072,7 +2071,7 @@ qemuProcessSetEmulatorAffinities(virConnectPtr conn
ATTRIBUTE_UNUSED,
else
return 0;
- ret = virProcessInfoSetAffinity(vm->pid, cpumask);
+ ret = virProcessSetAffinity(vm->pid, cpumask);
return ret;
}
diff --git a/src/util/processinfo.c b/src/util/processinfo.c
deleted file mode 100644
index b1db049..0000000
--- a/src/util/processinfo.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2009-2010, 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- *
- * Authors:
- * Daniel P. Berrange <berrange(a)redhat.com>
- */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <sched.h>
-
-#include "processinfo.h"
-#include "virterror_internal.h"
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-#if HAVE_SCHED_GETAFFINITY
-
-int virProcessInfoSetAffinity(pid_t pid, virBitmapPtr map)
-{
- int i;
- bool set = false;
-# ifdef CPU_ALLOC
- /* New method dynamically allocates cpu mask, allowing unlimted cpus */
- int numcpus = 1024;
- size_t masklen;
- cpu_set_t *mask;
-
- /* Not only may the statically allocated cpu_set_t be too small,
- * but there is no way to ask the kernel what size is large enough.
- * So you have no option but to pick a size, try, catch EINVAL,
- * enlarge, and re-try.
- *
- * http://lkml.org/lkml/2009/7/28/620
- */
-realloc:
- masklen = CPU_ALLOC_SIZE(numcpus);
- mask = CPU_ALLOC(numcpus);
-
- if (!mask) {
- virReportOOMError();
- return -1;
- }
-
- CPU_ZERO_S(masklen, mask);
- for (i = 0 ; i < virBitmapSize(map); i++) {
- if (virBitmapGetBit(map, i, &set) < 0)
- return -1;
- if (set)
- CPU_SET_S(i, masklen, mask);
- }
-
- if (sched_setaffinity(pid, masklen, mask) < 0) {
- CPU_FREE(mask);
- if (errno == EINVAL &&
- numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for
anyone */
- numcpus = numcpus << 2;
- goto realloc;
- }
- virReportSystemError(errno,
- _("cannot set CPU affinity on process %d"), pid);
- return -1;
- }
- CPU_FREE(mask);
-# else
- /* Legacy method uses a fixed size cpu mask, only allows up to 1024 cpus */
- cpu_set_t mask;
-
- CPU_ZERO(&mask);
- for (i = 0 ; i < virBitmapSize(map); i++) {
- if (virBitmapGetBit(map, i, &set) < 0)
- return -1;
- if (set)
- CPU_SET(i, &mask);
- }
-
- if (sched_setaffinity(pid, sizeof(mask), &mask) < 0) {
- virReportSystemError(errno,
- _("cannot set CPU affinity on process %d"), pid);
- return -1;
- }
-# endif
-
- return 0;
-}
-
-int virProcessInfoGetAffinity(pid_t pid,
- virBitmapPtr *map,
- int maxcpu)
-{
- int i;
-# ifdef CPU_ALLOC
- /* New method dynamically allocates cpu mask, allowing unlimted cpus */
- int numcpus = 1024;
- size_t masklen;
- cpu_set_t *mask;
-
- /* Not only may the statically allocated cpu_set_t be too small,
- * but there is no way to ask the kernel what size is large enough.
- * So you have no option but to pick a size, try, catch EINVAL,
- * enlarge, and re-try.
- *
- * http://lkml.org/lkml/2009/7/28/620
- */
-realloc:
- masklen = CPU_ALLOC_SIZE(numcpus);
- mask = CPU_ALLOC(numcpus);
-
- if (!mask) {
- virReportOOMError();
- return -1;
- }
-
- CPU_ZERO_S(masklen, mask);
- if (sched_getaffinity(pid, masklen, mask) < 0) {
- CPU_FREE(mask);
- if (errno == EINVAL &&
- numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for
anyone */
- numcpus = numcpus << 2;
- goto realloc;
- }
- virReportSystemError(errno,
- _("cannot get CPU affinity of process %d"), pid);
- return -1;
- }
-
- *map = virBitmapNew(maxcpu);
- if (!*map) {
- virReportOOMError();
- return -1;
- }
-
- for (i = 0 ; i < maxcpu ; i++)
- if (CPU_ISSET_S(i, masklen, mask))
- ignore_value(virBitmapSetBit(*map, i));
- CPU_FREE(mask);
-# else
- /* Legacy method uses a fixed size cpu mask, only allows up to 1024 cpus */
- cpu_set_t mask;
-
- CPU_ZERO(&mask);
- if (sched_getaffinity(pid, sizeof(mask), &mask) < 0) {
- virReportSystemError(errno,
- _("cannot get CPU affinity of process %d"), pid);
- return -1;
- }
-
- for (i = 0 ; i < maxcpu ; i++)
- if (CPU_ISSET(i, &mask))
- ignore_value(virBitmapSetBit(*map, i));
-# endif
-
- return 0;
-}
-
-#else /* HAVE_SCHED_GETAFFINITY */
-
-int virProcessInfoSetAffinity(pid_t pid ATTRIBUTE_UNUSED,
- virBitmapPtr map ATTRIBUTE_UNUSED)
-{
- virReportSystemError(ENOSYS, "%s",
- _("Process CPU affinity is not supported on this
platform"));
- return -1;
-}
-
-int virProcessInfoGetAffinity(pid_t pid ATTRIBUTE_UNUSED,
- virBitmapPtr *map ATTRIBUTE_UNUSED,
- int maxcpu ATTRIBUTE_UNUSED)
-{
- virReportSystemError(ENOSYS, "%s",
- _("Process CPU affinity is not supported on this
platform"));
- return -1;
-}
-#endif /* HAVE_SCHED_GETAFFINITY */
diff --git a/src/util/processinfo.h b/src/util/processinfo.h
deleted file mode 100644
index 0ae23c6..0000000
--- a/src/util/processinfo.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2009 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- *
- * Authors:
- * Daniel P. Berrange <berrange(a)redhat.com>
- */
-
-#ifndef __VIR_PROCESSINFO_H__
-# define __VIR_PROCESSINFO_H__
-
-# include "internal.h"
-# include "virbitmap.h"
-
-int virProcessInfoSetAffinity(pid_t pid, virBitmapPtr map);
-
-int virProcessInfoGetAffinity(pid_t pid,
- virBitmapPtr *map,
- int maxcpu);
-
-#endif /* __VIR_PROCESSINFO_H__ */
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 8070b8b..155e4e2 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -25,6 +25,7 @@
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
+#include <sched.h>
#include "virprocess.h"
#include "virterror_internal.h"
@@ -300,3 +301,163 @@ virProcessKillPainfully(pid_t pid, bool force)
cleanup:
return ret;
}
+
+
+#if HAVE_SCHED_GETAFFINITY
+
+int virProcessSetAffinity(pid_t pid, virBitmapPtr map)
+{
+ int i;
+ bool set = false;
+# ifdef CPU_ALLOC
+ /* New method dynamically allocates cpu mask, allowing unlimted cpus */
+ int numcpus = 1024;
+ size_t masklen;
+ cpu_set_t *mask;
+
+ /* Not only may the statically allocated cpu_set_t be too small,
+ * but there is no way to ask the kernel what size is large enough.
+ * So you have no option but to pick a size, try, catch EINVAL,
+ * enlarge, and re-try.
+ *
+ * http://lkml.org/lkml/2009/7/28/620
+ */
+realloc:
+ masklen = CPU_ALLOC_SIZE(numcpus);
+ mask = CPU_ALLOC(numcpus);
+
+ if (!mask) {
+ virReportOOMError();
+ return -1;
+ }
+
+ CPU_ZERO_S(masklen, mask);
+ for (i = 0 ; i < virBitmapSize(map); i++) {
+ if (virBitmapGetBit(map, i, &set) < 0)
+ return -1;
+ if (set)
+ CPU_SET_S(i, masklen, mask);
+ }
+
+ if (sched_setaffinity(pid, masklen, mask) < 0) {
+ CPU_FREE(mask);
+ if (errno == EINVAL &&
+ numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for
anyone */
+ numcpus = numcpus << 2;
+ goto realloc;
+ }
+ virReportSystemError(errno,
+ _("cannot set CPU affinity on process %d"), pid);
+ return -1;
+ }
+ CPU_FREE(mask);
+# else
+ /* Legacy method uses a fixed size cpu mask, only allows up to 1024 cpus */
+ cpu_set_t mask;
+
+ CPU_ZERO(&mask);
+ for (i = 0 ; i < virBitmapSize(map); i++) {
+ if (virBitmapGetBit(map, i, &set) < 0)
+ return -1;
+ if (set)
+ CPU_SET(i, &mask);
+ }
+
+ if (sched_setaffinity(pid, sizeof(mask), &mask) < 0) {
+ virReportSystemError(errno,
+ _("cannot set CPU affinity on process %d"), pid);
+ return -1;
+ }
+# endif
+
+ return 0;
+}
+
+int virProcessGetAffinity(pid_t pid,
+ virBitmapPtr *map,
+ int maxcpu)
+{
+ int i;
+# ifdef CPU_ALLOC
+ /* New method dynamically allocates cpu mask, allowing unlimted cpus */
+ int numcpus = 1024;
+ size_t masklen;
+ cpu_set_t *mask;
+
+ /* Not only may the statically allocated cpu_set_t be too small,
+ * but there is no way to ask the kernel what size is large enough.
+ * So you have no option but to pick a size, try, catch EINVAL,
+ * enlarge, and re-try.
+ *
+ * http://lkml.org/lkml/2009/7/28/620
+ */
+realloc:
+ masklen = CPU_ALLOC_SIZE(numcpus);
+ mask = CPU_ALLOC(numcpus);
+
+ if (!mask) {
+ virReportOOMError();
+ return -1;
+ }
+
+ CPU_ZERO_S(masklen, mask);
+ if (sched_getaffinity(pid, masklen, mask) < 0) {
+ CPU_FREE(mask);
+ if (errno == EINVAL &&
+ numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for
anyone */
+ numcpus = numcpus << 2;
+ goto realloc;
+ }
+ virReportSystemError(errno,
+ _("cannot get CPU affinity of process %d"), pid);
+ return -1;
+ }
+
+ *map = virBitmapNew(maxcpu);
+ if (!*map) {
+ virReportOOMError();
+ return -1;
+ }
+
+ for (i = 0 ; i < maxcpu ; i++)
+ if (CPU_ISSET_S(i, masklen, mask))
+ ignore_value(virBitmapSetBit(*map, i));
+ CPU_FREE(mask);
+# else
+ /* Legacy method uses a fixed size cpu mask, only allows up to 1024 cpus */
+ cpu_set_t mask;
+
+ CPU_ZERO(&mask);
+ if (sched_getaffinity(pid, sizeof(mask), &mask) < 0) {
+ virReportSystemError(errno,
+ _("cannot get CPU affinity of process %d"), pid);
+ return -1;
+ }
+
+ for (i = 0 ; i < maxcpu ; i++)
+ if (CPU_ISSET(i, &mask))
+ ignore_value(virBitmapSetBit(*map, i));
+# endif
+
+ return 0;
+}
+
+#else /* HAVE_SCHED_GETAFFINITY */
+
+int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED,
+ virBitmapPtr map ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(ENOSYS, "%s",
+ _("Process CPU affinity is not supported on this
platform"));
+ return -1;
+}
+
+int virProcessGetAffinity(pid_t pid ATTRIBUTE_UNUSED,
+ virBitmapPtr *map ATTRIBUTE_UNUSED,
+ int maxcpu ATTRIBUTE_UNUSED)
+{
+ virReportSystemError(ENOSYS, "%s",
+ _("Process CPU affinity is not supported on this
platform"));
+ return -1;
+}
+#endif /* HAVE_SCHED_GETAFFINITY */
diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index d537d92..8724f64 100644
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -25,6 +25,7 @@
# include <sys/types.h>
# include "internal.h"
+# include "virbitmap.h"
char *
virProcessTranslateStatus(int status);
@@ -40,5 +41,10 @@ int virProcessKill(pid_t pid, int sig);
int virProcessKillPainfully(pid_t pid, bool force);
+int virProcessSetAffinity(pid_t pid, virBitmapPtr map);
+
+int virProcessGetAffinity(pid_t pid,
+ virBitmapPtr *map,
+ int maxcpu);
#endif /* __VIR_PROCESS_H__ */
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 18/28] Rename sexpr.{c,h} to virsexpr.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
cfg.mk | 2 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/util/{sexpr.c => virsexpr.c} | 2 +-
src/util/{sexpr.h => virsexpr.h} | 0
src/xen/xend_internal.c | 2 +-
src/xenxs/xen_sxpr.h | 2 +-
src/xenxs/xen_xm.c | 2 +-
8 files changed, 7 insertions(+), 7 deletions(-)
rename src/util/{sexpr.c => virsexpr.c} (99%)
rename src/util/{sexpr.h => virsexpr.h} (100%)
diff --git a/cfg.mk b/cfg.mk
index cdd02e4..d1b46b9 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -807,7 +807,7 @@ exclude_file_name_regexp--sc_prohibit_sprintf = \
exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/util\.c$$
exclude_file_name_regexp--sc_prohibit_strtol = \
- ^src/(util/sexpr|(vbox|xen|xenxs)/.*)\.c$$
+ ^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$
exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/xml\.c$$
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2dc72f6..4e841a1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/sexpr.c
src/util/stats_linux.c
src/util/storage_file.c
src/util/sysinfo.c
@@ -174,6 +173,7 @@ src/util/virpci.c
src/util/virpidfile.c
src/util/virprocess.c
src/util/virrandom.c
+src/util/virsexpr.c
src/util/virsocketaddr.c
src/util/virterror.c
src/util/virterror_internal.h
diff --git a/src/Makefile.am b/src/Makefile.am
index cbdfc45..f639956 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/sexpr.c util/sexpr.h \
util/stats_linux.c util/stats_linux.h \
util/storage_file.c util/storage_file.h \
util/sysinfo.c util/sysinfo.h \
@@ -87,6 +86,7 @@ UTIL_SOURCES = \
util/virpci.c util/virpci.h \
util/virpidfile.c util/virpidfile.h \
util/virprocess.c util/virprocess.h \
+ util/virsexpr.c util/virsexpr.h \
util/virtypedparam.c util/virtypedparam.h \
util/xml.c util/xml.h \
util/virterror.c util/virterror_internal.h \
diff --git a/src/util/sexpr.c b/src/util/virsexpr.c
similarity index 99%
rename from src/util/sexpr.c
rename to src/util/virsexpr.c
index ae0cc18..80c24c4 100644
--- a/src/util/sexpr.c
+++ b/src/util/virsexpr.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include "virterror_internal.h"
-#include "sexpr.h"
+#include "virsexpr.h"
#include "util.h"
#include "viralloc.h"
diff --git a/src/util/sexpr.h b/src/util/virsexpr.h
similarity index 100%
rename from src/util/sexpr.h
rename to src/util/virsexpr.h
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index a4005f4..6e8bc2f 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -35,7 +35,7 @@
#include "xend_internal.h"
#include "driver.h"
#include "util.h"
-#include "sexpr.h"
+#include "virsexpr.h"
#include "xen_sxpr.h"
#include "virbuffer.h"
#include "uuid.h"
diff --git a/src/xenxs/xen_sxpr.h b/src/xenxs/xen_sxpr.h
index 4ff640c..d7ce46a 100644
--- a/src/xenxs/xen_sxpr.h
+++ b/src/xenxs/xen_sxpr.h
@@ -30,7 +30,7 @@
# include "internal.h"
# include "virconf.h"
# include "domain_conf.h"
-# include "sexpr.h"
+# include "virsexpr.h"
typedef enum {
XEND_CONFIG_VERSION_3_0_2 = 1,
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 8a64aad..2291c02 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -31,7 +31,7 @@
#include "viralloc.h"
#include "verify.h"
#include "uuid.h"
-#include "sexpr.h"
+#include "virsexpr.h"
#include "count-one-bits.h"
#include "xenxs_private.h"
#include "xen_xm.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 19/28] Rename stats_linux.{c, h} to virstatslinux.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/lxc/lxc_driver.c | 2 +-
src/openvz/openvz_driver.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/uml/uml_driver.c | 2 +-
src/util/{stats_linux.c => virstatslinux.c} | 2 +-
src/util/{stats_linux.h => virstatslinux.h} | 0
src/xen/xen_hypervisor.c | 2 +-
tests/statstest.c | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
rename src/util/{stats_linux.c => virstatslinux.c} (99%)
rename src/util/{stats_linux.h => virstatslinux.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4e841a1..cf9c575 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/stats_linux.c
src/util/storage_file.c
src/util/sysinfo.c
src/util/util.c
@@ -175,6 +174,7 @@ src/util/virprocess.c
src/util/virrandom.c
src/util/virsexpr.c
src/util/virsocketaddr.c
+src/util/virstatslinux.c
src/util/virterror.c
src/util/virterror_internal.h
src/util/virtime.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f639956..2496f9c 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/stats_linux.c util/stats_linux.h \
util/storage_file.c util/storage_file.h \
util/sysinfo.c util/sysinfo.h \
util/threads.c util/threads.h \
@@ -87,6 +86,7 @@ UTIL_SOURCES = \
util/virpidfile.c util/virpidfile.h \
util/virprocess.c util/virprocess.h \
util/virsexpr.c util/virsexpr.h \
+ util/virstatslinux.c util/virstatslinux.h \
util/virtypedparam.c util/virtypedparam.h \
util/xml.c util/xml.h \
util/virterror.c util/virterror_internal.h \
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index a595dd9..936d21e 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -51,7 +51,7 @@
#include "virnetdevveth.h"
#include "nodeinfo.h"
#include "uuid.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
#include "virhook.h"
#include "virfile.h"
#include "virpidfile.h"
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 4c88499..f83a78f 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -58,7 +58,7 @@
#include "virlog.h"
#include "vircommand.h"
#include "viruri.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
#define VIR_FROM_THIS VIR_FROM_OPENVZ
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 02dd77b..d7bdd46 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -64,7 +64,7 @@
#include "virbuffer.h"
#include "util.h"
#include "nodeinfo.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
#include "capabilities.h"
#include "viralloc.h"
#include "uuid.h"
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index cece114..b20998f 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -49,7 +49,7 @@
#include "virbuffer.h"
#include "util.h"
#include "nodeinfo.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
#include "capabilities.h"
#include "viralloc.h"
#include "uuid.h"
diff --git a/src/util/stats_linux.c b/src/util/virstatslinux.c
similarity index 99%
rename from src/util/stats_linux.c
rename to src/util/virstatslinux.c
index 67ef82e..9359db9 100644
--- a/src/util/stats_linux.c
+++ b/src/util/virstatslinux.c
@@ -35,7 +35,7 @@
# include "virterror_internal.h"
# include "datatypes.h"
# include "util.h"
-# include "stats_linux.h"
+# include "virstatslinux.h"
# include "viralloc.h"
# include "virfile.h"
diff --git a/src/util/stats_linux.h b/src/util/virstatslinux.h
similarity index 100%
rename from src/util/stats_linux.h
rename to src/util/virstatslinux.h
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 1837888..a692deb 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -70,7 +70,7 @@
#include "xen_driver.h"
#include "xen_hypervisor.h"
#include "xs_internal.h"
-#include "stats_linux.h"
+#include "virstatslinux.h"
#include "block_stats.h"
#include "xend_internal.h"
#include "virbuffer.h"
diff --git a/tests/statstest.c b/tests/statstest.c
index ad71bf9..30f9ab0 100644
--- a/tests/statstest.c
+++ b/tests/statstest.c
@@ -5,7 +5,7 @@
#include <string.h>
#include <sys/utsname.h>
-#include "stats_linux.h"
+#include "virstatslinux.h"
#include "internal.h"
#include "xen/block_stats.h"
#include "testutils.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 20/28] Rename storage_file.{c, h} to virstoragefile.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/domain_conf.h | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/esx/esx_storage_backend_iscsi.c | 2 +-
src/esx/esx_storage_backend_vmfs.c | 2 +-
src/libxl/libxl_conf.c | 2 +-
src/parallels/parallels_driver.c | 2 +-
src/parallels/parallels_storage.c | 2 +-
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_migration.c | 2 +-
src/security/security_dac.c | 2 +-
src/security/security_selinux.c | 2 +-
src/storage/storage_backend.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/util/util.c | 2 +-
src/util/{storage_file.c => virstoragefile.c} | 2 +-
src/util/{storage_file.h => virstoragefile.h} | 0
src/vbox/vbox_tmpl.c | 2 +-
src/xenxs/xen_sxpr.c | 2 +-
src/xenxs/xen_xm.c | 2 +-
26 files changed, 25 insertions(+), 25 deletions(-)
rename src/util/{storage_file.c => virstoragefile.c} (99%)
rename src/util/{storage_file.h => virstoragefile.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf9c575..9c142a4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/storage_file.c
src/util/sysinfo.c
src/util/util.c
src/util/viraudit.c
@@ -175,6 +174,7 @@ src/util/virrandom.c
src/util/virsexpr.c
src/util/virsocketaddr.c
src/util/virstatslinux.c
+src/util/virstoragefile.c
src/util/virterror.c
src/util/virterror_internal.h
src/util/virtime.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 2496f9c..2e0c175 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/storage_file.c util/storage_file.h \
util/sysinfo.c util/sysinfo.h \
util/threads.c util/threads.h \
util/threads-pthread.h \
@@ -87,6 +86,7 @@ UTIL_SOURCES = \
util/virprocess.c util/virprocess.h \
util/virsexpr.c util/virsexpr.h \
util/virstatslinux.c util/virstatslinux.h \
+ util/virstoragefile.c util/virstoragefile.h \
util/virtypedparam.c util/virtypedparam.h \
util/xml.c util/xml.h \
util/virterror.c util/virterror_internal.h \
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 49946b7..600dea6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -42,7 +42,7 @@
#include "virbuffer.h"
#include "virlog.h"
#include "nwfilter_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "virfile.h"
#include "virbitmap.h"
#include "count-one-bits.h"
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 01b76ec..9c328a3 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -47,7 +47,7 @@
# include "virobject.h"
# include "device_conf.h"
# include "virbitmap.h"
-# include "storage_file.h"
+# include "virstoragefile.h"
/* forward declarations of all device types, required by
* virDomainDeviceDef
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 9c16a88..5c40e97 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -41,7 +41,7 @@
#include "nwfilter_conf.h"
#include "secret_conf.h"
#include "snapshot_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "util.h"
#include "uuid.h"
#include "virfile.h"
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 0e00588..5cd2393 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -36,7 +36,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "storage_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "xml.h"
#include "uuid.h"
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 9d481d2..5ad885a 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -33,7 +33,7 @@
#include "virlog.h"
#include "uuid.h"
#include "storage_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "esx_storage_backend_iscsi.h"
#include "esx_private.h"
#include "esx_vi.h"
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index bca637b..4886fc3 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -36,7 +36,7 @@
#include "virlog.h"
#include "uuid.h"
#include "storage_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "esx_storage_backend_vmfs.h"
#include "esx_private.h"
#include "esx_vi.h"
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 5b20c39..9117c9b 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -42,7 +42,7 @@
#include "libxl_driver.h"
#include "libxl_conf.h"
#include "libxl_utils.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#define VIR_FROM_THIS VIR_FROM_LIBXL
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index e3d2711..2ac01c4 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -47,7 +47,7 @@
#include "virlog.h"
#include "vircommand.h"
#include "configmake.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "nodeinfo.h"
#include "c-ctype.h"
diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c
index f546d28..0e6c100 100644
--- a/src/parallels/parallels_storage.c
+++ b/src/parallels/parallels_storage.c
@@ -33,7 +33,7 @@
#include "datatypes.h"
#include "viralloc.h"
#include "configmake.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "virterror_internal.h"
#include "parallels_utils.h"
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a3d1ddb..fc58ca7 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -44,7 +44,7 @@
#include "virnetdevtap.h"
#include "base64.h"
#include "device_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8dcadbc..3e1081a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -36,7 +36,7 @@
#include "virfile.h"
#include "domain_event.h"
#include "virtime.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include <sys/time.h>
#include <fcntl.h>
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d7bdd46..b96d4a9 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -80,7 +80,7 @@
#include "sysinfo.h"
#include "domain_nwfilter.h"
#include "virhook.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "virfile.h"
#include "fdstream.h"
#include "configmake.h"
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 4874062..b54dce1 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -45,7 +45,7 @@
#include "virnetdevbridge.h"
#include "virnetdevtap.h"
#include "device_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#define VIR_FROM_THIS VIR_FROM_QEMU
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ff453be..5494e20 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -47,7 +47,7 @@
#include "virtime.h"
#include "locking/domain_lock.h"
#include "rpc/virnetsocket.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "viruri.h"
#include "virhook.h"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 862e590..6a4e1b7 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -30,7 +30,7 @@
#include "virlog.h"
#include "virpci.h"
#include "virusb.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
#define SECURITY_DAC_NAME "dac"
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 46c92ca..3ed7ee5 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -39,7 +39,7 @@
#include "virlog.h"
#include "virpci.h"
#include "virusb.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "virfile.h"
#include "virhash.h"
#include "virrandom.h"
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index cdc5bda..9b98dbb 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -52,7 +52,7 @@
#include "internal.h"
#include "secret_conf.h"
#include "uuid.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "storage_backend.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index f7b4656..b744fb4 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -44,7 +44,7 @@
#include "virterror_internal.h"
#include "storage_backend_fs.h"
#include "storage_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "vircommand.h"
#include "viralloc.h"
#include "xml.h"
diff --git a/src/util/util.c b/src/util/util.c
index c070d94..5d32995 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -79,7 +79,7 @@
#include "virlog.h"
#include "virbuffer.h"
#include "util.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "viralloc.h"
#include "threads.h"
#include "verify.h"
diff --git a/src/util/storage_file.c b/src/util/virstoragefile.c
similarity index 99%
rename from src/util/storage_file.c
rename to src/util/virstoragefile.c
index a020bb2..f183f19 100644
--- a/src/util/storage_file.c
+++ b/src/util/virstoragefile.c
@@ -22,7 +22,7 @@
*/
#include <config.h>
-#include "storage_file.h"
+#include "virstoragefile.h"
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/util/storage_file.h b/src/util/virstoragefile.h
similarity index 100%
rename from src/util/storage_file.h
rename to src/util/virstoragefile.h
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index e39a9de..cb1698f 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -47,7 +47,7 @@
#include "virterror_internal.h"
#include "domain_event.h"
#include "storage_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
#include "uuid.h"
#include "viralloc.h"
#include "nodeinfo.h"
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 0cbc248..b28c538 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -36,7 +36,7 @@
#include "count-one-bits.h"
#include "xenxs_private.h"
#include "xen_sxpr.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
/* Get a domain id from a S-expression string */
int xenGetDomIdFromSxprString(const char *sexpr, int xendConfigVersion)
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 2291c02..f483264 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -37,7 +37,7 @@
#include "xen_xm.h"
#include "xen_sxpr.h"
#include "domain_conf.h"
-#include "storage_file.h"
+#include "virstoragefile.h"
/* Convenience method to grab a long int from the config file object */
static int xenXMConfigGetBool(virConfPtr conf,
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 21/28] Rename sysinfo.{c, h} to virsysinfo.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/conf/domain_conf.h | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/util/{sysinfo.c => virsysinfo.c} | 2 +-
src/util/{sysinfo.h => virsysinfo.h} | 0
tests/sysinfotest.c | 2 +-
7 files changed, 6 insertions(+), 6 deletions(-)
rename src/util/{sysinfo.c => virsysinfo.c} (99%)
rename src/util/{sysinfo.h => virsysinfo.h} (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9c142a4..1420774 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/sysinfo.c
src/util/util.c
src/util/viraudit.c
src/util/virauth.c
@@ -175,6 +174,7 @@ src/util/virsexpr.c
src/util/virsocketaddr.c
src/util/virstatslinux.c
src/util/virstoragefile.c
+src/util/virsysinfo.c
src/util/virterror.c
src/util/virterror_internal.h
src/util/virtime.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e0c175..e19a482 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/sysinfo.c util/sysinfo.h \
util/threads.c util/threads.h \
util/threads-pthread.h \
util/threads-win32.h \
@@ -87,6 +86,7 @@ UTIL_SOURCES = \
util/virsexpr.c util/virsexpr.h \
util/virstatslinux.c util/virstatslinux.h \
util/virstoragefile.c util/virstoragefile.h \
+ util/virsysinfo.c util/virsysinfo.h \
util/virtypedparam.c util/virtypedparam.h \
util/xml.c util/xml.h \
util/virterror.c util/virterror_internal.h \
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9c328a3..e267b19 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -39,7 +39,7 @@
# include "nwfilter_params.h"
# include "nwfilter_conf.h"
# include "virnetdevmacvlan.h"
-# include "sysinfo.h"
+# include "virsysinfo.h"
# include "virnetdevvportprofile.h"
# include "virnetdevopenvswitch.h"
# include "virnetdevbandwidth.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b96d4a9..7359e7b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -77,7 +77,7 @@
#include "libvirt_internal.h"
#include "xml.h"
#include "cpu/cpu.h"
-#include "sysinfo.h"
+#include "virsysinfo.h"
#include "domain_nwfilter.h"
#include "virhook.h"
#include "virstoragefile.h"
diff --git a/src/util/sysinfo.c b/src/util/virsysinfo.c
similarity index 99%
rename from src/util/sysinfo.c
rename to src/util/virsysinfo.c
index 6da87ce..683f538 100644
--- a/src/util/sysinfo.c
+++ b/src/util/virsysinfo.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include "virterror_internal.h"
-#include "sysinfo.h"
+#include "virsysinfo.h"
#include "util.h"
#include "virlog.h"
#include "viralloc.h"
diff --git a/src/util/sysinfo.h b/src/util/virsysinfo.h
similarity index 100%
rename from src/util/sysinfo.h
rename to src/util/virsysinfo.h
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 9340af2..fb0ff6a 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -31,7 +31,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "sysinfo.h"
+#include "virsysinfo.h"
#include "testutils.h"
#include "util.h"
#include "virfile.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 22/28] Rename threadpool.{c, h} to virthreadpool.{c, h}
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
5:55 a.m.
New subject: [libvirt] [PATCH v2 23/28] Rename threads.{c, h} to virthread.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
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
5:55 a.m.
New subject: [libvirt] [PATCH v2 24/28] Rename util.{c,h} to virutil.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
cfg.mk | 16 ++++++++--------
daemon/libvirtd.c | 2 +-
daemon/remote.c | 2 +-
po/POTFILES.in | 2 +-
python/libvirt-override.c | 2 +-
src/Makefile.am | 5 +++--
src/conf/capabilities.c | 2 +-
src/conf/cpu_conf.c | 2 +-
src/conf/cpu_conf.h | 2 +-
src/conf/device_conf.c | 2 +-
src/conf/device_conf.h | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/domain_conf.h | 2 +-
src/conf/interface_conf.c | 2 +-
src/conf/interface_conf.h | 2 +-
src/conf/netdev_bandwidth_conf.c | 2 +-
src/conf/network_conf.c | 2 +-
src/conf/node_device_conf.c | 2 +-
src/conf/node_device_conf.h | 2 +-
src/conf/nwfilter_conf.h | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/secret_conf.h | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/conf/storage_conf.h | 2 +-
src/conf/storage_encryption_conf.c | 2 +-
src/conf/storage_encryption_conf.h | 2 +-
src/cpu/cpu_powerpc.c | 2 +-
src/cpu/cpu_x86.c | 2 +-
src/datatypes.c | 2 +-
src/driver.c | 2 +-
src/esx/esx_device_monitor.c | 2 +-
src/esx/esx_driver.c | 2 +-
src/esx/esx_interface_driver.c | 2 +-
src/esx/esx_network_driver.c | 2 +-
src/esx/esx_nwfilter_driver.c | 2 +-
src/esx/esx_secret_driver.c | 2 +-
src/esx/esx_storage_backend_iscsi.c | 2 +-
src/esx/esx_storage_backend_vmfs.c | 2 +-
src/esx/esx_util.c | 2 +-
src/esx/esx_vi.c | 2 +-
src/esx/esx_vi_types.c | 2 +-
src/fdstream.c | 2 +-
src/hyperv/hyperv_device_monitor.c | 2 +-
src/hyperv/hyperv_driver.c | 2 +-
src/hyperv/hyperv_interface_driver.c | 2 +-
src/hyperv/hyperv_network_driver.c | 2 +-
src/hyperv/hyperv_nwfilter_driver.c | 2 +-
src/hyperv/hyperv_secret_driver.c | 2 +-
src/hyperv/hyperv_storage_driver.c | 2 +-
src/hyperv/hyperv_util.c | 2 +-
src/hyperv/hyperv_wmi.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/locking/lock_daemon_dispatch.c | 2 +-
src/locking/lock_driver_lockd.c | 2 +-
src/locking/lock_driver_sanlock.c | 2 +-
src/locking/lock_manager.c | 2 +-
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 3 +--
src/lxc/lxc_driver.c | 2 +-
src/lxc/lxc_fuse.h | 2 +-
src/network/bridge_driver.c | 2 +-
src/node_device/node_device_driver.c | 2 +-
src/node_device/node_device_udev.c | 2 +-
src/nodeinfo.c | 2 +-
src/openvz/openvz_conf.c | 2 +-
src/openvz/openvz_driver.c | 2 +-
src/parallels/parallels_driver.c | 2 +-
src/phyp/phyp_driver.c | 2 +-
src/qemu/qemu_bridge_filter.c | 2 +-
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_cgroup.c | 2 +-
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_migration.c | 2 +-
src/qemu/qemu_process.c | 2 +-
src/remote/remote_driver.c | 2 +-
src/rpc/virkeepalive.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetclientprogram.c | 2 +-
src/rpc/virnetmessage.c | 2 +-
src/rpc/virnetserver.c | 2 +-
src/rpc/virnetsocket.c | 2 +-
src/rpc/virnetsshsession.c | 2 +-
src/rpc/virnettlscontext.c | 2 +-
src/secret/secret_driver.c | 2 +-
src/security/security_apparmor.c | 2 +-
src/security/security_dac.c | 2 +-
src/security/security_selinux.c | 4 ++--
src/security/virt-aa-helper.c | 2 +-
src/storage/parthelper.c | 2 +-
src/storage/storage_backend.c | 2 +-
src/storage/storage_backend_disk.c | 2 +-
src/storage/storage_backend_iscsi.c | 2 +-
src/storage/storage_backend_rbd.c | 2 +-
src/storage/storage_backend_sheepdog.c | 2 +-
src/storage/storage_driver.c | 2 +-
src/test/test_driver.c | 2 +-
src/uml/uml_conf.c | 2 +-
src/uml/uml_driver.c | 2 +-
src/util/iohelper.c | 2 +-
src/util/uuid.c | 2 +-
src/util/viraudit.c | 2 +-
src/util/virauth.c | 2 +-
src/util/virauthconfig.c | 2 +-
src/util/virbitmap.c | 2 +-
src/util/vircgroup.c | 2 +-
src/util/vircommand.c | 2 +-
src/util/vircommand.h | 2 +-
src/util/virconf.c | 2 +-
src/util/virdnsmasq.c | 2 +-
src/util/vireventpoll.c | 2 +-
src/util/virhook.c | 2 +-
src/util/virhook.h | 2 +-
src/util/virinitctl.c | 2 +-
src/util/virjson.c | 2 +-
src/util/virkeycode.h | 2 +-
src/util/virkeyfile.c | 2 +-
src/util/virlockspace.c | 2 +-
src/util/virlog.c | 2 +-
src/util/virnetdevbridge.c | 2 +-
src/util/virnetdevmacvlan.c | 2 +-
src/util/virnetdevopenvswitch.h | 2 +-
src/util/virnetdevtap.c | 2 +-
src/util/virnetdevvportprofile.h | 2 +-
src/util/virpidfile.c | 2 +-
src/util/virprocess.c | 2 +-
src/util/virrandom.c | 2 +-
src/util/virsexpr.c | 2 +-
src/util/virsocketaddr.c | 2 +-
src/util/virstatslinux.c | 2 +-
src/util/virstoragefile.h | 2 +-
src/util/virsysinfo.c | 2 +-
src/util/virsysinfo.h | 2 +-
src/util/virterror.c | 2 +-
src/util/virtime.c | 2 +-
src/util/virtypedparam.c | 2 +-
src/util/viruri.c | 2 +-
src/util/virusb.c | 2 +-
src/util/{util.c => virutil.c} | 2 +-
src/util/{util.h => virutil.h} | 0
src/util/xml.c | 2 +-
src/vbox/vbox_MSCOMGlue.c | 2 +-
src/vbox/vbox_XPCOMCGlue.c | 2 +-
src/vbox/vbox_driver.c | 2 +-
src/vmware/vmware_driver.c | 2 +-
src/xen/block_stats.c | 2 +-
src/xen/xen_driver.c | 2 +-
src/xen/xen_hypervisor.c | 2 +-
src/xen/xend_internal.c | 2 +-
src/xen/xm_internal.c | 2 +-
src/xenapi/xenapi_driver.c | 2 +-
src/xenapi/xenapi_utils.c | 2 +-
tests/commandhelper.c | 2 +-
tests/commandtest.c | 2 +-
tests/esxutilstest.c | 2 +-
tests/eventtest.c | 2 +-
tests/libvirtdconftest.c | 2 +-
tests/nodeinfotest.c | 2 +-
tests/openvzutilstest.c | 2 +-
tests/qemumonitortest.c | 2 +-
tests/qemumonitortestutils.c | 2 +-
tests/securityselinuxtest.c | 2 +-
tests/sysinfotest.c | 2 +-
tests/testutils.c | 2 +-
tests/utiltest.c | 2 +-
tests/virauthconfigtest.c | 2 +-
tests/virbuftest.c | 2 +-
tests/virdrivermoduletest.c | 2 +-
tests/virhashtest.c | 2 +-
tests/virkeyfiletest.c | 2 +-
tests/virlockspacetest.c | 2 +-
tests/virnetmessagetest.c | 2 +-
tests/virnetsockettest.c | 2 +-
tests/virnettlscontexttest.c | 2 +-
tests/virshtest.c | 2 +-
tests/virstringtest.c | 2 +-
tests/virtimetest.c | 2 +-
tests/viruritest.c | 2 +-
tools/console.c | 2 +-
tools/virsh-domain.c | 2 +-
tools/virsh-host.c | 2 +-
tools/virsh-interface.c | 2 +-
tools/virsh-network.c | 2 +-
tools/virsh-nodedev.c | 2 +-
tools/virsh-nwfilter.c | 2 +-
tools/virsh-pool.c | 2 +-
tools/virsh-secret.c | 2 +-
tools/virsh-snapshot.c | 2 +-
tools/virsh-volume.c | 2 +-
tools/virsh.c | 2 +-
tools/virt-host-validate-common.c | 2 +-
193 files changed, 202 insertions(+), 202 deletions(-)
rename src/util/{util.c => virutil.c} (99%)
rename src/util/{util.h => virutil.h} (100%)
diff --git a/cfg.mk b/cfg.mk
index d1b46b9..289567f 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -745,7 +745,7 @@ $(srcdir)/src/remote/remote_client_bodies.h:
$(srcdir)/src/remote/remote_protoco
# List all syntax-check exemptions:
exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$
-_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
+_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|virutil)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
exclude_file_name_regexp--sc_avoid_write = \
^(src/($(_src1))|daemon/libvirtd|tools/console|tests/(shunload|virnettlscontext)test)\.c$$
@@ -764,13 +764,13 @@ exclude_file_name_regexp--sc_po_check =
^(docs/|src/rpc/gendispatch\.pl$$)
exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \
^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virterror\.c)$$
-exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/virutil\.c$$
exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \
^python/(libvirt-(qemu-)?override|typewrappers)\.c$$
exclude_file_name_regexp--sc_prohibit_asprintf = \
- ^(bootstrap.conf$$|src/util/util\.c$$|examples/domain-events/events-c/event-test\.c$$)
+
^(bootstrap.conf$$|src/util/virutil\.c$$|examples/domain-events/events-c/event-test\.c$$)
exclude_file_name_regexp--sc_prohibit_close = \
(\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c)$$)
@@ -782,10 +782,10 @@
_src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon)
exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
(^($(_src2)|tests/testutils|daemon/libvirtd)\.c$$)
-exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/virutil\.c$$
exclude_file_name_regexp--sc_prohibit_internal_functions = \
- ^src/(util/(viralloc|util|virfile)\.[hc]|esx/esx_vi\.c)$$
+ ^src/(util/(viralloc|virutil|virfile)\.[hc]|esx/esx_vi\.c)$$
exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \
^src/rpc/gendispatch\.pl$$
@@ -797,14 +797,14 @@ exclude_file_name_regexp--sc_prohibit_raw_allocation = \
^(src/util/viralloc\.[ch]|examples/.*)$$
exclude_file_name_regexp--sc_prohibit_readlink = \
- ^src/(util/util|lxc/lxc_container)\.c$$
+ ^src/(util/virutil|lxc/lxc_container)\.c$$
-exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/virutil\.c$$
exclude_file_name_regexp--sc_prohibit_sprintf = \
^(docs/hacking\.html\.in)|(examples/systemtap/.*stp)|(src/dtrace2systemtap\.pl)|(src/rpc/gensystemtap\.pl)$$
-exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virutil\.c$$
exclude_file_name_regexp--sc_prohibit_strtol = \
^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 7b76c74..6c8bb94 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -43,7 +43,7 @@
#include "libvirtd.h"
#include "libvirtd-config.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "remote_driver.h"
#include "viralloc.h"
diff --git a/daemon/remote.c b/daemon/remote.c
index 7c7f806..eec43d3 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -35,7 +35,7 @@
#include "datatypes.h"
#include "viralloc.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "stream.h"
#include "uuid.h"
#include "libvirt/libvirt-qemu.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1420774..2cda7a9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
src/uml/uml_conf.c
src/uml/uml_driver.c
src/util/iohelper.c
-src/util/util.c
src/util/viraudit.c
src/util/virauth.c
src/util/virauthconfig.c
@@ -181,6 +180,7 @@ src/util/virtime.c
src/util/virtypedparam.c
src/util/viruri.c
src/util/virusb.c
+src/util/virutil.c
src/util/xml.c
src/vbox/vbox_MSCOMGlue.c
src/vbox/vbox_XPCOMCGlue.c
diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index 644f34d..91e82c6 100644
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -27,7 +27,7 @@
#include "viralloc.h"
#include "virtypedparam.h"
#include "ignore-value.h"
-#include "util.h"
+#include "virutil.h"
#ifndef __CYGWIN__
extern void initlibvirtmod(void);
diff --git a/src/Makefile.am b/src/Makefile.am
index 8afcb31..e77d481 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,6 @@ augeastest_DATA =
# helper APIs for various purposes
UTIL_SOURCES = \
util/uuid.c util/uuid.h \
- util/util.c util/util.h \
util/viralloc.c util/viralloc.h \
util/virarch.h util/virarch.c \
util/viratomic.h util/viratomic.c \
@@ -115,7 +114,9 @@ UTIL_SOURCES = \
util/virstring.h util/virstring.c \
util/virtime.h util/virtime.c \
util/virusb.c util/virusb.h \
- util/viruri.h util/viruri.c
+ util/viruri.h util/viruri.c \
+ util/virutil.c util/virutil.h \
+ $(NULL)
EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
$(srcdir)/util/virkeycode-mapgen.py
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 694e9b9..e786e69 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -28,7 +28,7 @@
#include "capabilities.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "cpu_conf.h"
#include "virterror_internal.h"
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 6011361..491a8c7 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -25,7 +25,7 @@
#include "virterror_internal.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virbuffer.h"
#include "cpu_conf.h"
#include "domain_conf.h"
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 368c26b..12865b4 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -24,7 +24,7 @@
#ifndef __VIR_CPU_CONF_H__
# define __VIR_CPU_CONF_H__
-# include "util.h"
+# include "virutil.h"
# include "virbuffer.h"
# include "xml.h"
# include "virbitmap.h"
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index c3ca2d6..4efafc4 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -26,7 +26,7 @@
#include "viralloc.h"
#include "xml.h"
#include "uuid.h"
-#include "util.h"
+#include "virutil.h"
#include "virbuffer.h"
#include "device_conf.h"
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index c1bf096..52e4ac5 100644
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -28,7 +28,7 @@
# include <libxml/xpath.h>
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
# include "virthread.h"
# include "virbuffer.h"
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 600dea6..d3f02a2 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -38,7 +38,7 @@
#include "verify.h"
#include "xml.h"
#include "uuid.h"
-#include "util.h"
+#include "virutil.h"
#include "virbuffer.h"
#include "virlog.h"
#include "nwfilter_conf.h"
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c7a19ae..a975a63 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -32,7 +32,7 @@
# include "capabilities.h"
# include "storage_encryption_conf.h"
# include "cpu_conf.h"
-# include "util.h"
+# include "virutil.h"
# include "virthread.h"
# include "virhash.h"
# include "virsocketaddr.h"
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 046a8a1..e4b088a 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -30,7 +30,7 @@
#include "viralloc.h"
#include "xml.h"
#include "uuid.h"
-#include "util.h"
+#include "virutil.h"
#include "virbuffer.h"
#define VIR_FROM_THIS VIR_FROM_INTERFACE
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index d6f98f1..e636c35 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -29,7 +29,7 @@
# include <libxml/xpath.h>
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
# include "virthread.h"
/* There is currently 3 types of interfaces */
diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 35f067c..e64aeff 100644
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -24,7 +24,7 @@
#include "netdev_bandwidth_conf.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "domain_conf.h"
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 1932851..42f3593 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -40,7 +40,7 @@
#include "viralloc.h"
#include "xml.h"
#include "uuid.h"
-#include "util.h"
+#include "virutil.h"
#include "virbuffer.h"
#include "c-ctype.h"
#include "virfile.h"
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 045f05d..12819c8 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -33,7 +33,7 @@
#include "node_device_conf.h"
#include "viralloc.h"
#include "xml.h"
-#include "util.h"
+#include "virutil.h"
#include "virbuffer.h"
#include "uuid.h"
#include "virpci.h"
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 9860f67..12c36d8 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -26,7 +26,7 @@
# define __VIR_NODE_DEVICE_CONF_H__
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
# include "virthread.h"
# include <libxml/tree.h>
diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index d597064..2ca44b3 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -28,7 +28,7 @@
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
# include "virhash.h"
# include "xml.h"
# include "virbuffer.h"
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 5188c7a..a65cf92 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -29,7 +29,7 @@
#include "viralloc.h"
#include "secret_conf.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "xml.h"
#include "uuid.h"
diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index 2064286..6079d5b 100644
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -24,7 +24,7 @@
# define __VIR_SECRET_CONF_H__
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
VIR_ENUM_DECL(virSecretUsageType)
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 5c40e97..810d2bf 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -42,7 +42,7 @@
#include "secret_conf.h"
#include "snapshot_conf.h"
#include "virstoragefile.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "virfile.h"
#include "virterror_internal.h"
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 5cd2393..38bb471 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -41,7 +41,7 @@
#include "xml.h"
#include "uuid.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virfile.h"
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 573c3db..ad16eca 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -25,7 +25,7 @@
# define __VIR_STORAGE_CONF_H__
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
# include "storage_encryption_conf.h"
# include "virthread.h"
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 8d3ceac..139c37c 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -31,7 +31,7 @@
#include "viralloc.h"
#include "storage_conf.h"
#include "storage_encryption_conf.h"
-#include "util.h"
+#include "virutil.h"
#include "xml.h"
#include "virterror_internal.h"
#include "uuid.h"
diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h
index 40a8497..57ab1a0 100644
--- a/src/conf/storage_encryption_conf.h
+++ b/src/conf/storage_encryption_conf.h
@@ -25,7 +25,7 @@
# include "internal.h"
# include "virbuffer.h"
-# include "util.h"
+# include "virutil.h"
# include <libxml/tree.h>
diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index cbc813b..8bef627 100644
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -28,7 +28,7 @@
#include "virlog.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "cpu.h"
#include "cpu_map.h"
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 55e20c9..c9a833a 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -27,7 +27,7 @@
#include "virlog.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "cpu.h"
#include "cpu_map.h"
#include "cpu_x86.h"
diff --git a/src/datatypes.c b/src/datatypes.c
index 0907c7d..07aefcc 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -27,7 +27,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "uuid.h"
-#include "util.h"
+#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/driver.c b/src/driver.c
index 23dc329..0a5fe05 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -27,7 +27,7 @@
#include "driver.h"
#include "viralloc.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "configmake.h"
#define DEFAULT_DRIVER_DIR LIBDIR "/libvirt/connection-driver"
diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 854fc38..7cc6ac0 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -25,7 +25,7 @@
#include <config.h>
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 346b9bc..8e24e80 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -28,7 +28,7 @@
#include "domain_conf.h"
#include "snapshot_conf.h"
#include "virauth.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index fea67ab..524886f 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -25,7 +25,7 @@
#include <config.h>
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index fec7e72..0fc2603 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -26,7 +26,7 @@
#include "md5.h"
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index 7a05a5a..ecee0fb 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -25,7 +25,7 @@
#include <config.h>
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 2969b19..722d3f7 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 5ad885a..3c3ab7d 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "md5.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index 4886fc3..c57e070 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -31,7 +31,7 @@
#include "internal.h"
#include "md5.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index bcda9df..9b2e576 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 37b6e0f..2cc8002 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -29,7 +29,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "vmx.h"
#include "xml.h"
diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index b93223d..d1f91ff 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -31,7 +31,7 @@
#include "datatypes.h"
#include "viralloc.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "esx_vi.h"
#include "esx_vi_types.h"
diff --git a/src/fdstream.c b/src/fdstream.c
index 39e92b8..f7f101e 100644
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -37,7 +37,7 @@
#include "datatypes.h"
#include "virlog.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "configmake.h"
diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index d6edb76..10d559f 100644
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 749c7f0..d777bd8 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -27,7 +27,7 @@
#include "datatypes.h"
#include "domain_conf.h"
#include "virauth.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 43c7dd7..af37de3 100644
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index 06b051b..cafc956 100644
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index 7452b7a..46c57b7 100644
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index 04a6ada..ea8fa7e 100644
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index b2817a2..7549801 100644
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 016d415..69a57c6 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -24,7 +24,7 @@
#include "internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 69e7283..f4afdce 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -29,7 +29,7 @@
#include "datatypes.h"
#include "virlog.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "virbuffer.h"
#include "hyperv_private.h"
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 3d90c57..df9923e 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -33,7 +33,7 @@
#include "lock_daemon.h"
#include "lock_daemon_config.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virpidfile.h"
#include "virprocess.h"
diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index 78c9726..def7c2f 100644
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -24,7 +24,7 @@
#include "rpc/virnetserver.h"
#include "rpc/virnetserverclient.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "lock_daemon.h"
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index cee530d..547db85 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -26,7 +26,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "uuid.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virterror_internal.h"
#include "rpc/virnetclient.h"
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index e520444..511543a 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -40,7 +40,7 @@
#include "virlog.h"
#include "virterror_internal.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "md5.h"
#include "virconf.h"
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index f938b04..d73e184 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -25,7 +25,7 @@
#include "lock_driver_nop.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "uuid.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 6b66fde..ca741f9 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -56,7 +56,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "lxc_container.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virnetdevveth.h"
#include "uuid.h"
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 8283c8f..123db3c 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -53,7 +53,7 @@
#include "virterror_internal.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "lxc_conf.h"
#include "lxc_container.h"
@@ -63,7 +63,6 @@
#include "virnetdev.h"
#include "virnetdevveth.h"
#include "viralloc.h"
-#include "util.h"
#include "virfile.h"
#include "virpidfile.h"
#include "vircommand.h"
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 936d21e..2f89452 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -46,7 +46,7 @@
#include "lxc_driver.h"
#include "lxc_process.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virnetdevbridge.h"
#include "virnetdevveth.h"
#include "nodeinfo.h"
diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index 9878017..93964a4 100644
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -32,7 +32,7 @@
# endif
# include "lxc_conf.h"
-# include "util.h"
+# include "virutil.h"
# include "viralloc.h"
struct virLXCMeminfo {
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 90beb7e..da72562 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -52,7 +52,7 @@
#include "driver.h"
#include "virbuffer.h"
#include "virpidfile.h"
-#include "util.h"
+#include "virutil.h"
#include "vircommand.h"
#include "viralloc.h"
#include "uuid.h"
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index d914816..6cc1837 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -37,7 +37,7 @@
#include "node_device_conf.h"
#include "node_device_hal.h"
#include "node_device_driver.h"
-#include "util.h"
+#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_NODEDEV
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 7289a72..d350955 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -35,7 +35,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "uuid.h"
-#include "util.h"
+#include "virutil.h"
#include "virbuffer.h"
#include "virpci.h"
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index efce29c..b47107c 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -42,7 +42,7 @@
#include "viralloc.h"
#include "nodeinfo.h"
#include "physmem.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "virterror_internal.h"
#include "count-one-bits.h"
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 7e42b51..4b1e258 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -48,7 +48,7 @@
#include "uuid.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "nodeinfo.h"
#include "virfile.h"
#include "vircommand.h"
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index f83a78f..ca0e927 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -49,7 +49,7 @@
#include "openvz_driver.h"
#include "openvz_util.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "openvz_conf.h"
#include "nodeinfo.h"
#include "viralloc.h"
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 2ac01c4..75cce68 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -43,7 +43,7 @@
#include "datatypes.h"
#include "virterror_internal.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "vircommand.h"
#include "configmake.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index b09156f..bfb6ed1 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -44,7 +44,7 @@
#include "internal.h"
#include "virauth.h"
-#include "util.h"
+#include "virutil.h"
#include "datatypes.h"
#include "virbuffer.h"
#include "viralloc.h"
diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index 08a9f1a..6d84f47 100644
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -25,7 +25,7 @@
#include "virebtables.h"
#include "qemu_conf.h"
#include "qemu_driver.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6071cdf..6aba2bc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -27,7 +27,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virpidfile.h"
#include "virprocess.h"
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index de4a5be..a2ea5c6 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -30,7 +30,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "domain_audit.h"
#define VIR_FROM_THIS VIR_FROM_QEMU
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index fc58ca7..eed8b82 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -31,8 +31,8 @@
#include "viralloc.h"
#include "virlog.h"
#include "virterror_internal.h"
-#include "util.h"
#include "virarch.h"
+#include "virutil.h"
#include "virfile.h"
#include "uuid.h"
#include "c-ctype.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 9e0789f..c8e5d53 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -42,7 +42,7 @@
#include "uuid.h"
#include "virbuffer.h"
#include "virconf.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "datatypes.h"
#include "xml.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a14cdb3..2d8f3f4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -62,7 +62,7 @@
#include "virlog.h"
#include "datatypes.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "nodeinfo.h"
#include "virstatslinux.h"
#include "capabilities.h"
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 5494e20..d1cba02 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -39,7 +39,7 @@
#include "virlog.h"
#include "virterror_internal.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "datatypes.h"
#include "fdstream.h"
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0e823bd..ad144d0 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -57,7 +57,7 @@
#include "virhook.h"
#include "virfile.h"
#include "virpidfile.h"
-#include "util.h"
+#include "virutil.h"
#include "c-ctype.h"
#include "nodeinfo.h"
#include "domain_audit.h"
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 2edf6e6..ac7dc87 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -39,7 +39,7 @@
#include "remote_protocol.h"
#include "qemu_protocol.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "vircommand.h"
#include "intprops.h"
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 5c14e14..18be350 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -26,7 +26,7 @@
#include "virthread.h"
#include "virfile.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "virnetsocket.h"
#include "virkeepaliveprotocol.h"
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 85787f0..9347f0b 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -34,7 +34,7 @@
#include "virthread.h"
#include "virfile.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 00948e0..eff4a4c 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -31,7 +31,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virthread.h"
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index f273811..b2da65b 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -28,7 +28,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "virfile.h"
-#include "util.h"
+#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index b48af5e..47a6293 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -33,7 +33,7 @@
#include "virterror_internal.h"
#include "virthread.h"
#include "virthreadpool.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virnetservermdns.h"
#include "virdbus.h"
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 442850a..a959c30 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -41,7 +41,7 @@
#include "c-ctype.h"
#include "virnetsocket.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 663b7cd..ad8bd48 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -31,7 +31,7 @@
#include "virlog.h"
#include "configmake.h"
#include "virthread.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "virobject.h"
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 1ff40cf..b01de8c 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -32,7 +32,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "virthread.h"
#include "configmake.h"
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 672ff54..8dfd921 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -37,7 +37,7 @@
#include "secret_conf.h"
#include "secret_driver.h"
#include "virthread.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "virterror_internal.h"
#include "virfile.h"
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index d9699e2..2754301 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -38,7 +38,7 @@
#include "internal.h"
#include "security_apparmor.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virterror_internal.h"
#include "datatypes.h"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 6a4e1b7..5da4e73 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -25,7 +25,7 @@
#include "security_dac.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "virpci.h"
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 3ed7ee5..947fb34 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -34,7 +34,7 @@
#include "security_driver.h"
#include "security_selinux.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "virpci.h"
@@ -43,7 +43,7 @@
#include "virfile.h"
#include "virhash.h"
#include "virrandom.h"
-#include "util.h"
+#include "virutil.h"
#include "virconf.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 81f36ba..95b5278 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -41,7 +41,7 @@
#include "internal.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "vircommand.h"
diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index 5417ced..83f8279 100644
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -41,7 +41,7 @@
#include <unistd.h>
#include <locale.h>
-#include "util.h"
+#include "virutil.h"
#include "c-ctype.h"
#include "configmake.h"
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 9b98dbb..29272f1 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -47,7 +47,7 @@
#include "datatypes.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "internal.h"
#include "secret_conf.h"
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 8759b3a..aceb82b 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -29,7 +29,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "storage_backend_disk.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "vircommand.h"
#include "configmake.h"
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index ecb8f8e..e91c4b1 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -37,7 +37,7 @@
#include "virterror_internal.h"
#include "storage_backend_scsi.h"
#include "storage_backend_iscsi.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index e1f07ab..ffa3234 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -25,7 +25,7 @@
#include "virterror_internal.h"
#include "storage_backend_rbd.h"
#include "storage_conf.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "base64.h"
diff --git a/src/storage/storage_backend_sheepdog.c
b/src/storage/storage_backend_sheepdog.c
index d3b9d87..1046ac9 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -30,7 +30,7 @@
#include "storage_backend_sheepdog.h"
#include "storage_conf.h"
#include "vircommand.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index aebf8bb..d93617c 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -39,7 +39,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "driver.h"
-#include "util.h"
+#include "virutil.h"
#include "storage_driver.h"
#include "storage_conf.h"
#include "viralloc.h"
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index c91e3cd..4c0b1ab 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -36,7 +36,7 @@
#include "datatypes.h"
#include "test_driver.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "capabilities.h"
#include "viralloc.h"
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 496f279..38afbb9 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -38,7 +38,7 @@
#include "uuid.h"
#include "virbuffer.h"
#include "virconf.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "nodeinfo.h"
#include "virlog.h"
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index b20998f..05fb7f2 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -47,7 +47,7 @@
#include "uml_driver.h"
#include "uml_conf.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "nodeinfo.h"
#include "virstatslinux.h"
#include "capabilities.h"
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index dcb5c14..40b04f9 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "util.h"
+#include "virutil.h"
#include "virthread.h"
#include "virfile.h"
#include "viralloc.h"
diff --git a/src/util/uuid.c b/src/util/uuid.c
index 5232ba9..57cfaa6 100644
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -35,7 +35,7 @@
#include "c-ctype.h"
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "virlog.h"
#include "viralloc.h"
diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index a807b76..05189d5 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -30,7 +30,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "viraudit.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "viralloc.h"
diff --git a/src/util/virauth.c b/src/util/virauth.c
index c4c5676..cbb16ec 100644
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "virauth.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "datatypes.h"
diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index a0f0be5..d60f7bf 100644
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -26,7 +26,7 @@
#include "virkeyfile.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index cb9606b..b4ba3ef 100644
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -33,7 +33,7 @@
#include "virbitmap.h"
#include "viralloc.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "c-ctype.h"
#include "count-one-bits.h"
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 5c628cc..48cba93 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -38,7 +38,7 @@
#include <dirent.h>
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "vircgroup.h"
#include "virlog.h"
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 6e17a8d..d059586 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -36,7 +36,7 @@
#include "vircommand.h"
#include "viralloc.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "virfile.h"
#include "virpidfile.h"
diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index 4c88165..9b7117d 100644
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -23,7 +23,7 @@
# define __VIR_COMMAND_H__
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
# include "virbuffer.h"
typedef struct _virCommand virCommand;
diff --git a/src/util/virconf.c b/src/util/virconf.c
index 2f6d60e..7e4c8c1 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -33,7 +33,7 @@
#include "virterror_internal.h"
#include "virbuffer.h"
#include "virconf.h"
-#include "util.h"
+#include "virutil.h"
#include "c-ctype.h"
#include "virlog.h"
#include "viralloc.h"
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 67ffa4d..e9b0148 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -41,7 +41,7 @@
#include "datatypes.h"
#include "virbitmap.h"
#include "virdnsmasq.h"
-#include "util.h"
+#include "virutil.h"
#include "vircommand.h"
#include "viralloc.h"
#include "virterror_internal.h"
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index 1180fda..afb0e05 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -35,7 +35,7 @@
#include "virlog.h"
#include "vireventpoll.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virterror_internal.h"
#include "virtime.h"
diff --git a/src/util/virhook.c b/src/util/virhook.c
index 8a741de..5df6494 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -32,7 +32,7 @@
#include "virterror_internal.h"
#include "virhook.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "viralloc.h"
#include "virfile.h"
diff --git a/src/util/virhook.h b/src/util/virhook.h
index 0ca376f..56573df 100644
--- a/src/util/virhook.h
+++ b/src/util/virhook.h
@@ -25,7 +25,7 @@
# define __VIR_HOOKS_H__
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
enum virHookDriverType {
VIR_HOOK_DRIVER_DAEMON = 0, /* Daemon related events */
diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index 91a948f..f8ac673 100644
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -29,7 +29,7 @@
#include "internal.h"
#include "virinitctl.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virfile.h"
diff --git a/src/util/virjson.c b/src/util/virjson.c
index 4fa5363..4c9797c 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -27,7 +27,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#if HAVE_YAJL
# include <yajl/yajl_gen.h>
diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h
index 1522f77..a2e1391 100644
--- a/src/util/virkeycode.h
+++ b/src/util/virkeycode.h
@@ -22,7 +22,7 @@
#ifndef __VIR_UTIL_VIRTKEYCODE_H__
# define __VIR_UTIL_VIRTKEYCODE_H__
-# include "util.h"
+# include "virutil.h"
# include "libvirt/libvirt.h"
VIR_ENUM_DECL(virKeycodeSet);
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index fc61cf5..99e5cd7 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -28,7 +28,7 @@
#include "c-ctype.h"
#include "virlog.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virhash.h"
#include "virkeyfile.h"
#include "virterror_internal.h"
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 961e171..81a1d81 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -25,7 +25,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virhash.h"
#include "virthread.h"
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 0c6c13a..43a59b4 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -43,7 +43,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virbuffer.h"
#include "virthread.h"
#include "virfile.h"
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index eb341a2..4de88e3 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -24,7 +24,7 @@
#include "virnetdevbridge.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "viralloc.h"
#include "intprops.h"
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 0f7107b..953d76b 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -29,7 +29,7 @@
#include "virnetdevmacvlan.h"
#include "virmacaddr.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NET
diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index 147cd6f..3216ea0 100644
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -25,7 +25,7 @@
# define __VIR_NETDEV_OPENVSWITCH_H__
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
# include "virnetdevvportprofile.h"
# include "virnetdevvlan.h"
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 339d636..3565bbd 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -32,7 +32,7 @@
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include <sys/ioctl.h>
#include <net/if.h>
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index c4585a8..cc106b8 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -25,7 +25,7 @@
# include "internal.h"
# include "uuid.h"
-# include "util.h"
+# include "virutil.h"
# include "virmacaddr.h"
# define LIBVIRT_IFLA_VF_PORT_PROFILE_MAX 40
diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 3b3322b..29097e3 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -30,7 +30,7 @@
#include "virpidfile.h"
#include "virfile.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "intprops.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 155e4e2..b276643 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -31,7 +31,7 @@
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 1dd96cf..1b6de6b 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -29,7 +29,7 @@
#include "virrandom.h"
#include "virthread.h"
#include "count-one-bits.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c
index 80c24c4..8b70404 100644
--- a/src/util/virsexpr.c
+++ b/src/util/virsexpr.c
@@ -19,7 +19,7 @@
#include "virterror_internal.h"
#include "virsexpr.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_SEXPR
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 488ff4b..0f2f23d 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -25,7 +25,7 @@
#include "virsocketaddr.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#include <netdb.h>
diff --git a/src/util/virstatslinux.c b/src/util/virstatslinux.c
index 9359db9..135df75 100644
--- a/src/util/virstatslinux.c
+++ b/src/util/virstatslinux.c
@@ -34,7 +34,7 @@
# include "virterror_internal.h"
# include "datatypes.h"
-# include "util.h"
+# include "virutil.h"
# include "virstatslinux.h"
# include "viralloc.h"
# include "virfile.h"
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 6fbd275..abf319a 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -24,7 +24,7 @@
#ifndef __VIR_STORAGE_FILE_H__
# define __VIR_STORAGE_FILE_H__
-# include "util.h"
+# include "virutil.h"
enum virStorageFileFormat {
VIR_STORAGE_FILE_AUTO_SAFE = -2,
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 683f538..607c601 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -32,7 +32,7 @@
#include "virterror_internal.h"
#include "virsysinfo.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "viralloc.h"
#include "vircommand.h"
diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h
index 0b1f000..dded51b 100644
--- a/src/util/virsysinfo.h
+++ b/src/util/virsysinfo.h
@@ -25,7 +25,7 @@
# define __VIR_SYSINFOS_H__
# include "internal.h"
-# include "util.h"
+# include "virutil.h"
# include "virbuffer.h"
enum virSysinfoType {
diff --git a/src/util/virterror.c b/src/util/virterror.c
index 6c773d3..a586738 100644
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -32,7 +32,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "virthread.h"
-#include "util.h"
+#include "virutil.h"
virThreadLocal virLastErr;
diff --git a/src/util/virtime.c b/src/util/virtime.c
index f9fc282..c614380 100644
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -37,7 +37,7 @@
#include <sys/time.h>
#include "virtime.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virterror_internal.h"
diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index e08530e..60fb485 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -25,7 +25,7 @@
#include <stdarg.h>
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/viruri.c b/src/util/viruri.c
index f48079d..e59cd5a 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -23,7 +23,7 @@
#include "viruri.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "virbuffer.h"
diff --git a/src/util/virusb.c b/src/util/virusb.c
index 154965e..413cd63 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -34,7 +34,7 @@
#include "virusb.h"
#include "virlog.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#define USB_SYSFS "/sys/bus/usb"
diff --git a/src/util/util.c b/src/util/virutil.c
similarity index 99%
rename from src/util/util.c
rename to src/util/virutil.c
index c7d4aa5..9fb1c6f 100644
--- a/src/util/util.c
+++ b/src/util/virutil.c
@@ -78,7 +78,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "virstoragefile.h"
#include "viralloc.h"
#include "virthread.h"
diff --git a/src/util/util.h b/src/util/virutil.h
similarity index 100%
rename from src/util/util.h
rename to src/util/virutil.h
diff --git a/src/util/xml.c b/src/util/xml.c
index caf26a3..05c7f33 100644
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -33,7 +33,7 @@
#include "virterror_internal.h"
#include "xml.h"
#include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virfile.h"
diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index cab4398..36539f6 100644
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -31,7 +31,7 @@
#include "internal.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "virterror_internal.h"
#include "vbox_MSCOMGlue.h"
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 5296127..1954ddb 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -38,7 +38,7 @@
#include "vbox_XPCOMCGlue.h"
#include "internal.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index cd29e19..f2a0c8f 100644
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -38,7 +38,7 @@
#include "vbox_driver.h"
#include "vbox_glue.h"
#include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_VBOX
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 233804e..12195bf 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -28,7 +28,7 @@
#include "datatypes.h"
#include "virfile.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "vircommand.h"
#include "vmx.h"
diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 126283b..3f7c97b 100644
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -40,7 +40,7 @@
# include "virterror_internal.h"
# include "datatypes.h"
-# include "util.h"
+# include "virutil.h"
# include "block_stats.h"
# include "viralloc.h"
# include "virfile.h"
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 9b2fcf3..2b8496c 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -54,7 +54,7 @@
# include "xen_inotify.h"
#endif
#include "xml.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "node_device_conf.h"
#include "virpci.h"
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 22714a3..9443d98 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -66,7 +66,7 @@
#include "virlog.h"
#include "datatypes.h"
#include "driver.h"
-#include "util.h"
+#include "virutil.h"
#include "xen_driver.h"
#include "xen_hypervisor.h"
#include "xs_internal.h"
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 6e8bc2f..7ffc5bb 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -34,7 +34,7 @@
#include "datatypes.h"
#include "xend_internal.h"
#include "driver.h"
-#include "util.h"
+#include "virutil.h"
#include "virsexpr.h"
#include "xen_sxpr.h"
#include "virbuffer.h"
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 2109972..e3206eb 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -45,7 +45,7 @@
#include "virhash.h"
#include "virbuffer.h"
#include "uuid.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
#include "count-one-bits.h"
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index d49181c..49a8a74 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -31,7 +31,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "virauth.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "viralloc.h"
#include "virbuffer.h"
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 33aa4d7..15be403 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -29,7 +29,7 @@
#include "domain_conf.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
#include "uuid.h"
#include "viralloc.h"
#include "virbuffer.h"
diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index 3c7fef5..39f3c53 100644
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -27,7 +27,7 @@
#include <string.h>
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virfile.h"
#include "testutils.h"
diff --git a/tests/commandtest.c b/tests/commandtest.c
index b15c168..d6a285e 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -31,7 +31,7 @@
#include "testutils.h"
#include "internal.h"
#include "nodeinfo.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "vircommand.h"
#include "virfile.h"
diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index b65009b..55b3623 100644
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -9,7 +9,7 @@
# include "internal.h"
# include "viralloc.h"
# include "testutils.h"
-# include "util.h"
+# include "virutil.h"
# include "vmx/vmx.h"
# include "esx/esx_util.h"
# include "esx/esx_vi_types.h"
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 6d00ea8..16a693c 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -30,7 +30,7 @@
#include "internal.h"
#include "virthread.h"
#include "virlog.h"
-#include "util.h"
+#include "virutil.h"
#include "vireventpoll.h"
#define NUM_FDS 31
diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index 0365ade..c1d94d2 100644
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -24,7 +24,7 @@
#include "testutils.h"
#include "daemon/libvirtd-config.h"
-#include "util.h"
+#include "virutil.h"
#include "c-ctype.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index c79788e..d900eb9 100644
--- a/tests/nodeinfotest.c
+++ b/tests/nodeinfotest.c
@@ -8,7 +8,7 @@
#include "testutils.h"
#include "internal.h"
#include "nodeinfo.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#if ! (defined __linux__ && (defined(__x86_64__) || \
diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index 80701a2..9fb7178 100644
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -9,7 +9,7 @@
# include "internal.h"
# include "viralloc.h"
# include "testutils.h"
-# include "util.h"
+# include "virutil.h"
# include "openvz/openvz_conf.h"
static int
diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c
index 21a6828..285dfa8 100644
--- a/tests/qemumonitortest.c
+++ b/tests/qemumonitortest.c
@@ -10,7 +10,7 @@
# include "internal.h"
# include "viralloc.h"
# include "testutils.h"
-# include "util.h"
+# include "virutil.h"
# include "qemu/qemu_monitor.h"
struct testEscapeString
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index cc38803..b82eb5d 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -30,7 +30,7 @@
#include "qemu/qemu_monitor.h"
#include "rpc/virnetsocket.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "virterror_internal.h"
diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 0e4959e..93742cf 100644
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -31,7 +31,7 @@
#include "internal.h"
#include "testutils.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
#include "virterror_internal.h"
#include "security/security_manager.h"
diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index fb0ff6a..1370974 100644
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -33,7 +33,7 @@
#include "virbuffer.h"
#include "virsysinfo.h"
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#if defined (__linux__)
diff --git a/tests/testutils.c b/tests/testutils.c
index c6b1d23..d88af21 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -40,7 +40,7 @@
#include "testutils.h"
#include "internal.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virthread.h"
#include "virterror_internal.h"
#include "virbuffer.h"
diff --git a/tests/utiltest.c b/tests/utiltest.c
index 4fbb25c..9d18652 100644
--- a/tests/utiltest.c
+++ b/tests/utiltest.c
@@ -8,7 +8,7 @@
#include "internal.h"
#include "viralloc.h"
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
static void
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 9e7dac5..2ad237d 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -24,7 +24,7 @@
#include <signal.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index ec93939..7f9ee66 100644
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -5,7 +5,7 @@
#include <string.h>
#include "internal.h"
-#include "util.h"
+#include "virutil.h"
#include "testutils.h"
#include "virbuffer.h"
#include "viralloc.h"
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index e06179f..cab47d3 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -21,7 +21,7 @@
#include <config.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index a2a40c6..6e4f267 100644
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -10,7 +10,7 @@
#include "virhashdata.h"
#include "testutils.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virlog.h"
diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index ad5a516..33f64c1 100644
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -24,7 +24,7 @@
#include <signal.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index 80478d9..c434f47 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -25,7 +25,7 @@
#include <sys/stat.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index e3517e8..4e7a1fd 100644
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -24,7 +24,7 @@
#include <signal.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 399c4fd..819257b 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -28,7 +28,7 @@
#include <netdb.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index 27078ea..d945181 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -27,7 +27,7 @@
#include <gnutls/x509.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virshtest.c b/tests/virshtest.c
index 72f2a1e..8741d47 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -6,7 +6,7 @@
#include "internal.h"
#include "xml.h"
-#include "util.h"
+#include "virutil.h"
#include "testutils.h"
#ifdef WIN32
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index a8f4c79..58ab843 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index 7d7a2d6..1c22d07 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -24,7 +24,7 @@
#include <signal.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/viruritest.c b/tests/viruritest.c
index 57d3895..ad59270 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -24,7 +24,7 @@
#include <signal.h>
#include "testutils.h"
-#include "util.h"
+#include "virutil.h"
#include "virterror_internal.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tools/console.c b/tools/console.c
index d031308..d024d38 100644
--- a/tools/console.c
+++ b/tools/console.c
@@ -39,7 +39,7 @@
# include "internal.h"
# include "console.h"
# include "virlog.h"
-# include "util.h"
+# include "virutil.h"
# include "virfile.h"
# include "viralloc.h"
# include "virthread.h"
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index b0b0c94..244ffb8 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -43,7 +43,7 @@
#include "conf/domain_conf.h"
#include "console.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virkeycode.h"
#include "virmacaddr.h"
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 2d59a75..0ad4296 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virsh-domain.h"
#include "xml.h"
#include "virtypedparam.h"
diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 40216c6..ea8a6c5 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "xml.h"
virInterfacePtr
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 66ee7e3..918dee6 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "xml.h"
#include "conf/network_conf.h"
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 7e569b3..974e495 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "xml.h"
#include "conf/node_device_conf.h"
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index c3dba0c..1480d13 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "xml.h"
virNWFilterPtr
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 6e29604..b3177e0 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -34,7 +34,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "xml.h"
#include "conf/storage_conf.h"
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index d81e8ce..a29454f 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -35,7 +35,7 @@
#include "base64.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "xml.h"
static virSecretPtr
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 3fecde6..8428282 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -36,7 +36,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virsh-domain.h"
#include "xml.h"
#include "conf/snapshot_conf.h"
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index ebfe52d..6f2c591 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -36,7 +36,7 @@
#include "internal.h"
#include "virbuffer.h"
#include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
#include "virfile.h"
#include "virsh-pool.h"
#include "xml.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 91a9677..bfeaaa1 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -58,7 +58,7 @@
#include "base64.h"
#include "virbuffer.h"
#include "console.h"
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "xml.h"
#include "libvirt/libvirt-qemu.h"
diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index cd75eba..34a527f 100644
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <sys/utsname.h>
-#include "util.h"
+#include "virutil.h"
#include "viralloc.h"
#include "virfile.h"
#include "virt-host-validate-common.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 25/28] Rename uuid.{c,h} to viruuid.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
daemon/libvirtd.c | 3 +--
daemon/remote.c | 2 +-
src/Makefile.am | 2 +-
src/conf/capabilities.c | 2 +-
src/conf/device_conf.c | 2 +-
src/conf/domain_audit.c | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/interface_conf.c | 2 +-
src/conf/network_conf.c | 2 +-
src/conf/node_device_conf.c | 2 +-
src/conf/nwfilter_conf.c | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/conf/storage_encryption_conf.c | 2 +-
src/datatypes.c | 2 +-
src/esx/esx_device_monitor.c | 2 +-
src/esx/esx_driver.c | 2 +-
src/esx/esx_interface_driver.c | 2 +-
src/esx/esx_network_driver.c | 2 +-
src/esx/esx_nwfilter_driver.c | 2 +-
src/esx/esx_secret_driver.c | 2 +-
src/esx/esx_storage_backend_iscsi.c | 2 +-
src/esx/esx_storage_backend_vmfs.c | 2 +-
src/esx/esx_storage_driver.c | 2 +-
src/esx/esx_util.c | 2 +-
src/esx/esx_vi.c | 2 +-
src/esx/esx_vi_methods.c | 2 +-
src/hyperv/hyperv_device_monitor.c | 2 +-
src/hyperv/hyperv_driver.c | 2 +-
src/hyperv/hyperv_interface_driver.c | 2 +-
src/hyperv/hyperv_network_driver.c | 2 +-
src/hyperv/hyperv_nwfilter_driver.c | 2 +-
src/hyperv/hyperv_secret_driver.c | 2 +-
src/hyperv/hyperv_storage_driver.c | 2 +-
src/hyperv/hyperv_util.c | 2 +-
src/hyperv/hyperv_wmi.c | 2 +-
src/libvirt.c | 2 +-
src/libxl/libxl_conf.c | 2 +-
src/libxl/libxl_driver.c | 2 +-
src/locking/domain_lock.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/locking/lock_driver_lockd.c | 2 +-
src/locking/lock_driver_nop.c | 2 +-
src/locking/lock_manager.c | 2 +-
src/lxc/lxc_conf.c | 2 +-
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_driver.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/node_device/node_device_hal.c | 2 +-
src/node_device/node_device_udev.c | 2 +-
src/openvz/openvz_conf.c | 2 +-
src/phyp/phyp_driver.c | 2 +-
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_migration.c | 2 +-
src/qemu/qemu_process.c | 2 +-
src/secret/secret_driver.c | 2 +-
src/security/security_apparmor.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/storage/storage_backend.c | 2 +-
src/storage/storage_backend_rbd.c | 2 +-
src/test/test_driver.c | 2 +-
src/uml/uml_conf.c | 2 +-
src/uml/uml_driver.c | 2 +-
src/util/virnetdevmacvlan.c | 2 +-
src/util/virnetdevvportprofile.h | 2 +-
src/util/{uuid.c => viruuid.c} | 2 +-
src/util/{uuid.h => viruuid.h} | 0
src/vbox/vbox_tmpl.c | 2 +-
src/vmware/vmware_conf.c | 2 +-
src/vmware/vmware_driver.c | 2 +-
src/vmx/vmx.c | 2 +-
src/xen/xen_driver.c | 2 +-
src/xen/xen_inotify.c | 2 +-
src/xen/xend_internal.c | 2 +-
src/xen/xm_internal.c | 2 +-
src/xen/xs_internal.c | 2 +-
src/xenapi/xenapi_driver.c | 2 +-
src/xenapi/xenapi_utils.c | 2 +-
src/xenxs/xen_sxpr.c | 2 +-
src/xenxs/xen_xm.c | 2 +-
84 files changed, 83 insertions(+), 84 deletions(-)
rename src/util/{uuid.c => viruuid.c} (99%)
rename src/util/{uuid.h => viruuid.h} (100%)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 6c8bb94..7ea968b 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -44,7 +44,7 @@
#include "libvirtd-config.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "remote_driver.h"
#include "viralloc.h"
#include "virconf.h"
@@ -53,7 +53,6 @@
#include "remote.h"
#include "remote_driver.h"
#include "virhook.h"
-#include "uuid.h"
#include "viraudit.h"
#include "locking/lock_manager.h"
diff --git a/daemon/remote.c b/daemon/remote.c
index eec43d3..31a8377 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -37,7 +37,7 @@
#include "virlog.h"
#include "virutil.h"
#include "stream.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "libvirt/libvirt-qemu.h"
#include "vircommand.h"
#include "intprops.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index e77d481..e8fd56e 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/uuid.c util/uuid.h \
util/viralloc.c util/viralloc.h \
util/virarch.h util/virarch.c \
util/viratomic.h util/viratomic.c \
@@ -116,6 +115,7 @@ UTIL_SOURCES = \
util/virusb.c util/virusb.h \
util/viruri.h util/viruri.c \
util/virutil.c util/virutil.h \
+ util/viruuid.c util/viruuid.h \
$(NULL)
EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index e786e69..ad9951b 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -29,7 +29,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "cpu_conf.h"
#include "virterror_internal.h"
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index 4efafc4..ecfaf30 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -25,7 +25,7 @@
#include "datatypes.h"
#include "viralloc.h"
#include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
#include "device_conf.h"
diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index 8919e62..7082804 100644
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -28,7 +28,7 @@
#include "domain_audit.h"
#include "viraudit.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virlog.h"
#include "viralloc.h"
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d3f02a2..7589b09 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -37,7 +37,7 @@
#include "viralloc.h"
#include "verify.h"
#include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
#include "virlog.h"
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index e4b088a..6a53bda 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -29,7 +29,7 @@
#include "viralloc.h"
#include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 42f3593..01a6f2e 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -39,7 +39,7 @@
#include "netdev_vlan_conf.h"
#include "viralloc.h"
#include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
#include "c-ctype.h"
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 12819c8..67d743e 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -35,7 +35,7 @@
#include "xml.h"
#include "virutil.h"
#include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virpci.h"
#include "virrandom.h"
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 09a9d1c..810de6c 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -38,7 +38,7 @@
#include "internal.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "viralloc.h"
#include "virterror_internal.h"
#include "datatypes.h"
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index a65cf92..2abb95a 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -31,7 +31,7 @@
#include "virterror_internal.h"
#include "virutil.h"
#include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
#define VIR_FROM_THIS VIR_FROM_SECRET
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 810d2bf..3ad74d6 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -43,7 +43,7 @@
#include "snapshot_conf.h"
#include "virstoragefile.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virfile.h"
#include "virterror_internal.h"
#include "xml.h"
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 38bb471..4239e49 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -39,7 +39,7 @@
#include "virstoragefile.h"
#include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virbuffer.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 139c37c..8ea54fa 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -34,7 +34,7 @@
#include "virutil.h"
#include "xml.h"
#include "virterror_internal.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/datatypes.c b/src/datatypes.c
index 07aefcc..038c47d 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -26,7 +26,7 @@
#include "virterror_internal.h"
#include "virlog.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 7cc6ac0..f6c85ba 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -28,7 +28,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "esx_private.h"
#include "esx_device_monitor.h"
#include "esx_vi.h"
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 8e24e80..1366c81 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -31,7 +31,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "vmx.h"
#include "virtypedparam.h"
#include "esx_driver.h"
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index 524886f..53c179b 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -28,7 +28,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "interface_conf.h"
#include "virsocketaddr.h"
#include "esx_private.h"
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 0fc2603..48763d4 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -29,7 +29,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "network_conf.h"
#include "esx_private.h"
#include "esx_network_driver.h"
diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index ecee0fb..c59929c 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -28,7 +28,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "esx_private.h"
#include "esx_nwfilter_driver.h"
#include "esx_vi.h"
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 722d3f7..92cbb14 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -27,7 +27,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "esx_private.h"
#include "esx_secret_driver.h"
#include "esx_vi.h"
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 3c3ab7d..e09fa55 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -31,7 +31,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "storage_conf.h"
#include "virstoragefile.h"
#include "esx_storage_backend_iscsi.h"
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index c57e070..f965b4f 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -34,7 +34,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "storage_conf.h"
#include "virstoragefile.h"
#include "esx_storage_backend_vmfs.h"
diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index 1324469..5fb4e1f 100644
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -25,7 +25,7 @@
#include <config.h>
-#include "uuid.h"
+#include "viruuid.h"
#include "viralloc.h"
#include "storage_conf.h"
#include "esx_private.h"
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 9b2e576..4d2019b 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -31,7 +31,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "vmx.h"
#include "esx_private.h"
#include "esx_util.h"
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 2cc8002..92ac8f8 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -30,7 +30,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "vmx.h"
#include "xml.h"
#include "esx_vi.h"
diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index 7ffca559..2279e62 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -26,7 +26,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "esx_vi_methods.h"
#include "esx_util.h"
diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index 10d559f..43ee1fc 100644
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -29,7 +29,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "hyperv_device_monitor.h"
#define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index d777bd8..601a85a 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -30,7 +30,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "hyperv_driver.h"
#include "hyperv_interface_driver.h"
#include "hyperv_network_driver.h"
diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index af37de3..7dd6912 100644
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -29,7 +29,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "hyperv_interface_driver.h"
#define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index cafc956..f34a451 100644
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -29,7 +29,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "hyperv_network_driver.h"
#define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index 46c57b7..c6125ec 100644
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -29,7 +29,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "hyperv_nwfilter_driver.h"
#define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index ea8fa7e..b830e4e 100644
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -29,7 +29,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "hyperv_secret_driver.h"
#define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 7549801..38385a0 100644
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -29,7 +29,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "hyperv_storage_driver.h"
#define VIR_FROM_THIS VIR_FROM_HYPERV
diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 69a57c6..9bc5b81 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -27,7 +27,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "hyperv_private.h"
#include "hyperv_util.h"
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index f4afdce..e029028 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -30,7 +30,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virbuffer.h"
#include "hyperv_private.h"
#include "hyperv_wmi.h"
diff --git a/src/libvirt.c b/src/libvirt.c
index 5654d53..e06b643 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -50,7 +50,7 @@
#include "datatypes.h"
#include "driver.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "viralloc.h"
#include "configmake.h"
#include "intprops.h"
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 9117c9b..8a1b21e 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -37,7 +37,7 @@
#include "virfile.h"
#include "virstring.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "capabilities.h"
#include "libxl_driver.h"
#include "libxl_conf.h"
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 4db2614..c62ec3d 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -37,7 +37,7 @@
#include "datatypes.h"
#include "virfile.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "vircommand.h"
#include "libxl.h"
#include "libxl_driver.h"
diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 0ae9750..0354e26 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -23,7 +23,7 @@
#include "domain_lock.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virterror_internal.h"
#include "virlog.h"
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index df9923e..a445b2e 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -44,7 +44,7 @@
#include "rpc/virnetserver.h"
#include "virrandom.h"
#include "virhash.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "locking/lock_daemon_dispatch.h"
#include "locking/lock_protocol.h"
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 547db85..9c7ce6d 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -25,7 +25,7 @@
#include "virconf.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virutil.h"
#include "virfile.h"
#include "virterror_internal.h"
diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c
index cf0f49a..e8e9917 100644
--- a/src/locking/lock_driver_nop.c
+++ b/src/locking/lock_driver_nop.c
@@ -24,7 +24,7 @@
#include "lock_driver_nop.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED,
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index d73e184..1b88838 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -27,7 +27,7 @@
#include "virlog.h"
#include "virutil.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#if HAVE_DLFCN_H
# include <dlfcn.h>
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index ede79d1..866718c 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -32,7 +32,7 @@
#include "virconf.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "configmake.h"
#include "lxc_container.h"
#include "virnodesuspend.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index ca741f9..6769d33 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -59,7 +59,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "virnetdevveth.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virfile.h"
#include "virusb.h"
#include "vircommand.h"
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 2f89452..91d09c4 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -50,7 +50,7 @@
#include "virnetdevbridge.h"
#include "virnetdevveth.h"
#include "nodeinfo.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virstatslinux.h"
#include "virhook.h"
#include "virfile.h"
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index da72562..4bf8a2b 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -55,7 +55,7 @@
#include "virutil.h"
#include "vircommand.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "viriptables.h"
#include "virlog.h"
#include "virdnsmasq.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 257a363..8ee816b 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -34,7 +34,7 @@
#include "driver.h"
#include "datatypes.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virpci.h"
#include "virlog.h"
#include "node_device_driver.h"
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index d350955..61e5a0e 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -34,7 +34,7 @@
#include "datatypes.h"
#include "virlog.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
#include "virpci.h"
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 4b1e258..b5a5c87 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -45,7 +45,7 @@
#include "virterror_internal.h"
#include "openvz_conf.h"
#include "openvz_util.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virbuffer.h"
#include "viralloc.h"
#include "virutil.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index bfb6ed1..df15253 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -52,7 +52,7 @@
#include "driver.h"
#include "libvirt/libvirt.h"
#include "virterror_internal.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "domain_conf.h"
#include "storage_conf.h"
#include "nodeinfo.h"
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index eed8b82..1443840 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -34,7 +34,7 @@
#include "virarch.h"
#include "virutil.h"
#include "virfile.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "c-ctype.h"
#include "domain_nwfilter.h"
#include "domain_audit.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index c8e5d53..8a21703 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -39,7 +39,7 @@
#include "qemu_command.h"
#include "qemu_capabilities.h"
#include "qemu_bridge_filter.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virbuffer.h"
#include "virconf.h"
#include "virutil.h"
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3e1081a..46b7656 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -32,7 +32,7 @@
#include "virterror_internal.h"
#include "c-ctype.h"
#include "cpu/cpu.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virfile.h"
#include "domain_event.h"
#include "virtime.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2d8f3f4..3832a6c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -67,7 +67,7 @@
#include "virstatslinux.h"
#include "capabilities.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "domain_conf.h"
#include "domain_audit.h"
#include "node_device_conf.h"
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index d1cba02..6cd16e7 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -43,7 +43,7 @@
#include "virfile.h"
#include "datatypes.h"
#include "fdstream.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virtime.h"
#include "locking/domain_lock.h"
#include "rpc/virnetsocket.h"
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ad144d0..2dd2416 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -64,7 +64,7 @@
#include "domain_nwfilter.h"
#include "locking/domain_lock.h"
#include "network/bridge_driver.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virprocess.h"
#include "virtime.h"
#include "virnetdevtap.h"
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 8dfd921..1784fea 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -38,7 +38,7 @@
#include "secret_driver.h"
#include "virthread.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virterror_internal.h"
#include "virfile.h"
#include "configmake.h"
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 2754301..3eb1e65 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -42,7 +42,7 @@
#include "viralloc.h"
#include "virterror_internal.h"
#include "datatypes.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virpci.h"
#include "virusb.h"
#include "virfile.h"
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 95b5278..fbf0b03 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -49,7 +49,7 @@
#include "security_apparmor.h"
#include "domain_conf.h"
#include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virusb.h"
#include "virpci.h"
#include "virfile.h"
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 29272f1..f98a7c0 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -51,7 +51,7 @@
#include "viralloc.h"
#include "internal.h"
#include "secret_conf.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virstoragefile.h"
#include "storage_backend.h"
#include "virlog.h"
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index ffa3234..7dc46b0 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -29,7 +29,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "base64.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "rados/librados.h"
#include "rbd/librbd.h"
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4c0b1ab..1f2718c 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -37,7 +37,7 @@
#include "test_driver.h"
#include "virbuffer.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "capabilities.h"
#include "viralloc.h"
#include "network_conf.h"
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 38afbb9..31a4490 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -35,7 +35,7 @@
#include <arpa/inet.h>
#include "uml_conf.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virbuffer.h"
#include "virconf.h"
#include "virutil.h"
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 05fb7f2..448d292 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -52,7 +52,7 @@
#include "virstatslinux.h"
#include "capabilities.h"
#include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "domain_conf.h"
#include "domain_audit.h"
#include "datatypes.h"
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 953d76b..720a48a 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -58,7 +58,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
# include "viralloc.h"
# include "virlog.h"
-# include "uuid.h"
+# include "viruuid.h"
# include "virfile.h"
# include "virnetlink.h"
# include "virnetdev.h"
diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index cc106b8..940c0e9 100644
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -24,7 +24,7 @@
# define __VIR_NETDEV_VPORT_PROFILE_H__
# include "internal.h"
-# include "uuid.h"
+# include "viruuid.h"
# include "virutil.h"
# include "virmacaddr.h"
diff --git a/src/util/uuid.c b/src/util/viruuid.c
similarity index 99%
rename from src/util/uuid.c
rename to src/util/viruuid.c
index 57cfaa6..f4eb331 100644
--- a/src/util/uuid.c
+++ b/src/util/viruuid.c
@@ -21,7 +21,7 @@
#include <config.h>
-#include "uuid.h"
+#include "viruuid.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/src/util/uuid.h b/src/util/viruuid.h
similarity index 100%
rename from src/util/uuid.h
rename to src/util/viruuid.h
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index cb1698f..597a7c5 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -48,7 +48,7 @@
#include "domain_event.h"
#include "storage_conf.h"
#include "virstoragefile.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "viralloc.h"
#include "nodeinfo.h"
#include "virlog.h"
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 6c8e924..2cbdd7c 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -29,7 +29,7 @@
#include "viralloc.h"
#include "nodeinfo.h"
#include "virfile.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virterror_internal.h"
#include "vmx.h"
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 12195bf..67cdc88 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -29,7 +29,7 @@
#include "virfile.h"
#include "viralloc.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "vircommand.h"
#include "vmx.h"
#include "vmware_conf.h"
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 4d55f0b..552f578 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -30,7 +30,7 @@
#include "virconf.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "vmx.h"
#include "viruri.h"
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 2b8496c..4cbe827 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -58,7 +58,7 @@
#include "viralloc.h"
#include "node_device_conf.h"
#include "virpci.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "fdstream.h"
#include "virfile.h"
#include "viruri.h"
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 35a625c..4cce25a 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -37,7 +37,7 @@
#include "xen_inotify.h"
#include "xend_internal.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virfile.h"
#include "xm_internal.h" /* for xenXMDomainConfigParse */
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 7ffc5bb..120e237 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -38,7 +38,7 @@
#include "virsexpr.h"
#include "xen_sxpr.h"
#include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "xen_driver.h"
#include "xen_hypervisor.h"
#include "xs_internal.h" /* To extract VNC port & Serial console TTY */
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index e3206eb..0806e77 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -44,7 +44,7 @@
#include "xen_xm.h"
#include "virhash.h"
#include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index e414966..20332df 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -46,7 +46,7 @@
#include "driver.h"
#include "viralloc.h"
#include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "xen_driver.h"
#include "xs_internal.h"
#include "xen_hypervisor.h"
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 49a8a74..4df6c5b 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -32,7 +32,7 @@
#include "datatypes.h"
#include "virauth.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "viralloc.h"
#include "virbuffer.h"
#include "viruri.h"
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 15be403..5c53b69 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -30,7 +30,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "viralloc.h"
#include "virbuffer.h"
#include "virlog.h"
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index b28c538..b83ac58 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -31,7 +31,7 @@
#include "virconf.h"
#include "viralloc.h"
#include "verify.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virlog.h"
#include "count-one-bits.h"
#include "xenxs_private.h"
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index f483264..d965d79 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -30,7 +30,7 @@
#include "virconf.h"
#include "viralloc.h"
#include "verify.h"
-#include "uuid.h"
+#include "viruuid.h"
#include "virsexpr.h"
#include "count-one-bits.h"
#include "xenxs_private.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 26/28] Rename xml.{c,h} to virxml.{c,h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
cfg.mk | 2 +-
po/POTFILES.in | 2 +-
src/Makefile.am | 2 +-
src/conf/cpu_conf.h | 2 +-
src/conf/device_conf.c | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/interface_conf.c | 2 +-
src/conf/netdev_bandwidth_conf.h | 2 +-
src/conf/netdev_vlan_conf.h | 2 +-
src/conf/netdev_vport_profile_conf.h | 2 +-
src/conf/network_conf.c | 2 +-
src/conf/node_device_conf.c | 2 +-
src/conf/nwfilter_conf.h | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/conf/storage_encryption_conf.c | 2 +-
src/cpu/cpu.c | 2 +-
src/cpu/cpu_map.h | 2 +-
src/esx/esx_vi.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/security/virt-aa-helper.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/test/test_driver.c | 2 +-
src/util/{xml.c => virxml.c} | 2 +-
src/util/{xml.h => virxml.h} | 0
src/xen/xen_driver.c | 2 +-
tests/cputest.c | 2 +-
tests/nwfilterxml2xmltest.c | 2 +-
tests/sexpr2xmltest.c | 2 +-
tests/virshtest.c | 2 +-
tests/xencapstest.c | 2 +-
tools/virsh-domain-monitor.c | 2 +-
tools/virsh-domain.c | 2 +-
tools/virsh-host.c | 2 +-
tools/virsh-interface.c | 2 +-
tools/virsh-network.c | 2 +-
tools/virsh-nodedev.c | 2 +-
tools/virsh-nwfilter.c | 2 +-
tools/virsh-pool.c | 2 +-
tools/virsh-secret.c | 2 +-
tools/virsh-snapshot.c | 2 +-
tools/virsh-volume.c | 2 +-
tools/virsh.c | 2 +-
45 files changed, 44 insertions(+), 44 deletions(-)
rename src/util/{xml.c => virxml.c} (99%)
rename src/util/{xml.h => virxml.h} (100%)
diff --git a/cfg.mk b/cfg.mk
index 289567f..38d72e8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -809,7 +809,7 @@ exclude_file_name_regexp--sc_prohibit_strncpy =
^src/util/virutil\.c$$
exclude_file_name_regexp--sc_prohibit_strtol = \
^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$
-exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/xml\.c$$
+exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/virxml\.c$$
exclude_file_name_regexp--sc_prohibit_xmlURI = ^src/util/viruri\.c$$
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2cda7a9..34290e1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -181,7 +181,7 @@ src/util/virtypedparam.c
src/util/viruri.c
src/util/virusb.c
src/util/virutil.c
-src/util/xml.c
+src/util/virxml.c
src/vbox/vbox_MSCOMGlue.c
src/vbox/vbox_XPCOMCGlue.c
src/vbox/vbox_driver.c
diff --git a/src/Makefile.am b/src/Makefile.am
index e8fd56e..7ebfabe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,6 @@ UTIL_SOURCES = \
util/virthreadwin32.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 \
util/vircgroup.c util/vircgroup.h \
util/virdbus.c util/virdbus.h \
@@ -116,6 +115,7 @@ UTIL_SOURCES = \
util/viruri.h util/viruri.c \
util/virutil.c util/virutil.h \
util/viruuid.c util/viruuid.h \
+ util/virxml.c util/virxml.h \
$(NULL)
EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 12865b4..23ea455 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -26,7 +26,7 @@
# include "virutil.h"
# include "virbuffer.h"
-# include "xml.h"
+# include "virxml.h"
# include "virbitmap.h"
# include "virarch.h"
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index ecfaf30..45ecb28 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -24,7 +24,7 @@
#include "virterror_internal.h"
#include "datatypes.h"
#include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7589b09..08f14ca 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -36,7 +36,7 @@
#include "snapshot_conf.h"
#include "viralloc.h"
#include "verify.h"
-#include "xml.h"
+#include "virxml.h"
#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 6a53bda..3867274 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -28,7 +28,7 @@
#include "interface_conf.h"
#include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index 216a540..23aaaf3 100644
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -26,7 +26,7 @@
# include "internal.h"
# include "virnetdevbandwidth.h"
# include "virbuffer.h"
-# include "xml.h"
+# include "virxml.h"
virNetDevBandwidthPtr virNetDevBandwidthParse(xmlNodePtr node,
int net_type)
diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h
index 19b50cc..480d6c6 100644
--- a/src/conf/netdev_vlan_conf.h
+++ b/src/conf/netdev_vlan_conf.h
@@ -25,7 +25,7 @@
# include "internal.h"
# include "virnetdevvlan.h"
# include "virbuffer.h"
-# include "xml.h"
+# include "virxml.h"
int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def);
int virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf);
diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h
index 15ecbd6..a70256d 100644
--- a/src/conf/netdev_vport_profile_conf.h
+++ b/src/conf/netdev_vport_profile_conf.h
@@ -26,7 +26,7 @@
# include "internal.h"
# include "virnetdevvportprofile.h"
# include "virbuffer.h"
-# include "xml.h"
+# include "virxml.h"
typedef enum {
/* generate random defaults for interfaceID/interfaceID
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 01a6f2e..2bd04c5 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -38,7 +38,7 @@
#include "netdev_bandwidth_conf.h"
#include "netdev_vlan_conf.h"
#include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
#include "viruuid.h"
#include "virutil.h"
#include "virbuffer.h"
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 67d743e..3c68011 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -32,7 +32,7 @@
#include "node_device_conf.h"
#include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
#include "virutil.h"
#include "virbuffer.h"
#include "viruuid.h"
diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 2ca44b3..ca2c070 100644
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -30,7 +30,7 @@
# include "virutil.h"
# include "virhash.h"
-# include "xml.h"
+# include "virxml.h"
# include "virbuffer.h"
# include "virsocketaddr.h"
# include "virmacaddr.h"
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 2abb95a..46d2ae5 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -30,7 +30,7 @@
#include "secret_conf.h"
#include "virterror_internal.h"
#include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
#include "viruuid.h"
#define VIR_FROM_THIS VIR_FROM_SECRET
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 3ad74d6..f7f8f63 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -46,7 +46,7 @@
#include "viruuid.h"
#include "virfile.h"
#include "virterror_internal.h"
-#include "xml.h"
+#include "virxml.h"
#define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 4239e49..04b2581 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -38,7 +38,7 @@
#include "storage_conf.h"
#include "virstoragefile.h"
-#include "xml.h"
+#include "virxml.h"
#include "viruuid.h"
#include "virbuffer.h"
#include "virutil.h"
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 8ea54fa..35e9da4 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -32,7 +32,7 @@
#include "storage_conf.h"
#include "storage_encryption_conf.h"
#include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
#include "virterror_internal.h"
#include "viruuid.h"
#include "virfile.h"
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 302629d..6beab55 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -25,7 +25,7 @@
#include "virlog.h"
#include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
#include "cpu.h"
#include "cpu_x86.h"
#include "cpu_powerpc.h"
diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h
index 9120513..8d27bcd 100644
--- a/src/cpu/cpu_map.h
+++ b/src/cpu/cpu_map.h
@@ -24,7 +24,7 @@
#ifndef __VIR_CPU_MAP_H__
# define __VIR_CPU_MAP_H__
-# include "xml.h"
+# include "virxml.h"
enum cpuMapElement {
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 92ac8f8..99c1eb1 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -32,7 +32,7 @@
#include "virutil.h"
#include "viruuid.h"
#include "vmx.h"
-#include "xml.h"
+#include "virxml.h"
#include "esx_vi.h"
#include "esx_vi_methods.h"
#include "esx_util.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 8a21703..ed18ac6 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -45,7 +45,7 @@
#include "virutil.h"
#include "viralloc.h"
#include "datatypes.h"
-#include "xml.h"
+#include "virxml.h"
#include "nodeinfo.h"
#include "virlog.h"
#include "cpu/cpu.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3832a6c..5b9fcf7 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -75,7 +75,7 @@
#include "virusb.h"
#include "virprocess.h"
#include "libvirt_internal.h"
-#include "xml.h"
+#include "virxml.h"
#include "cpu/cpu.h"
#include "virsysinfo.h"
#include "domain_nwfilter.h"
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index fbf0b03..70ff875 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -48,7 +48,7 @@
#include "security_driver.h"
#include "security_apparmor.h"
#include "domain_conf.h"
-#include "xml.h"
+#include "virxml.h"
#include "viruuid.h"
#include "virusb.h"
#include "virpci.h"
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index b744fb4..23fa0f5 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -47,7 +47,7 @@
#include "virstoragefile.h"
#include "vircommand.h"
#include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
#include "virfile.h"
#include "virlog.h"
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 1f2718c..4716e41 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -46,7 +46,7 @@
#include "domain_event.h"
#include "storage_conf.h"
#include "node_device_conf.h"
-#include "xml.h"
+#include "virxml.h"
#include "virthread.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/util/xml.c b/src/util/virxml.c
similarity index 99%
rename from src/util/xml.c
rename to src/util/virxml.c
index 05c7f33..02f7d1a 100644
--- a/src/util/xml.c
+++ b/src/util/virxml.c
@@ -31,7 +31,7 @@
#include <sys/stat.h>
#include "virterror_internal.h"
-#include "xml.h"
+#include "virxml.h"
#include "virbuffer.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/util/xml.h b/src/util/virxml.h
similarity index 100%
rename from src/util/xml.h
rename to src/util/virxml.h
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 4cbe827..c35695a 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -53,7 +53,7 @@
#if WITH_XEN_INOTIFY
# include "xen_inotify.h"
#endif
-#include "xml.h"
+#include "virxml.h"
#include "virutil.h"
#include "viralloc.h"
#include "node_device_conf.h"
diff --git a/tests/cputest.c b/tests/cputest.c
index 6299409..ab96824 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include "internal.h"
-#include "xml.h"
+#include "virxml.h"
#include "viralloc.h"
#include "virbuffer.h"
#include "testutils.h"
diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
index 8c29a46..a215bf8 100644
--- a/tests/nwfilterxml2xmltest.c
+++ b/tests/nwfilterxml2xmltest.c
@@ -10,7 +10,7 @@
#include "internal.h"
#include "testutils.h"
-#include "xml.h"
+#include "virxml.h"
#include "virthread.h"
#include "nwfilter_params.h"
#include "nwfilter_conf.h"
diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 9b9b09d..07f6f8e 100644
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -5,7 +5,7 @@
#include <unistd.h>
#include "internal.h"
-#include "xml.h"
+#include "virxml.h"
#include "datatypes.h"
#include "xen/xen_driver.h"
#include "xen/xend_internal.h"
diff --git a/tests/virshtest.c b/tests/virshtest.c
index 8741d47..b82a4c4 100644
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -5,7 +5,7 @@
#include <unistd.h>
#include "internal.h"
-#include "xml.h"
+#include "virxml.h"
#include "virutil.h"
#include "testutils.h"
diff --git a/tests/xencapstest.c b/tests/xencapstest.c
index c94d5c5..b8ad831 100644
--- a/tests/xencapstest.c
+++ b/tests/xencapstest.c
@@ -6,7 +6,7 @@
#include <unistd.h>
#include "internal.h"
-#include "xml.h"
+#include "virxml.h"
#include "testutils.h"
#include "xen/xen_hypervisor.h"
#include "virfile.h"
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index a443988..f4940fa 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -37,7 +37,7 @@
#include "viralloc.h"
#include "virmacaddr.h"
#include "virsh-domain.h"
-#include "xml.h"
+#include "virxml.h"
static const char *
vshDomainIOErrorToString(int error)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 244ffb8..3a9cebe 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -51,7 +51,7 @@
#include "virsh-domain-monitor.h"
#include "virterror_internal.h"
#include "virtypedparam.h"
-#include "xml.h"
+#include "virxml.h"
/* Gnulib doesn't guarantee SA_SIGINFO support. */
#ifndef SA_SIGINFO
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 0ad4296..45b89a8 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -36,7 +36,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virsh-domain.h"
-#include "xml.h"
+#include "virxml.h"
#include "virtypedparam.h"
#include "virjson.h"
diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index ea8a6c5..cd14e89 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -35,7 +35,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
virInterfacePtr
vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd,
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 918dee6..c9cd15a 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -35,7 +35,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
#include "conf/network_conf.h"
virNetworkPtr
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 974e495..f9517cc 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -35,7 +35,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
#include "conf/node_device_conf.h"
/*
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 1480d13..9341ea7 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -35,7 +35,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
virNWFilterPtr
vshCommandOptNWFilterBy(vshControl *ctl, const vshCmd *cmd,
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index b3177e0..adac7f1 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -35,7 +35,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
#include "conf/storage_conf.h"
virStoragePoolPtr
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index a29454f..8297743 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -36,7 +36,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virutil.h"
-#include "xml.h"
+#include "virxml.h"
static virSecretPtr
vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name)
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 8428282..3b179e2 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -38,7 +38,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virsh-domain.h"
-#include "xml.h"
+#include "virxml.h"
#include "conf/snapshot_conf.h"
/* Helper for snapshot-create and snapshot-create-as */
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 6f2c591..a57fc28 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -39,7 +39,7 @@
#include "virutil.h"
#include "virfile.h"
#include "virsh-pool.h"
-#include "xml.h"
+#include "virxml.h"
virStorageVolPtr
vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
diff --git a/tools/virsh.c b/tools/virsh.c
index bfeaaa1..790cf56 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -60,7 +60,7 @@
#include "console.h"
#include "virutil.h"
#include "viralloc.h"
-#include "xml.h"
+#include "virxml.h"
#include "libvirt/libvirt-qemu.h"
#include "virfile.h"
#include "configmake.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 27/28] Rename virterror.c virterror_internal.h to virerror.{c, h}
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
cfg.mk | 2 +-
daemon/libvirtd-config.c | 2 +-
daemon/libvirtd.c | 2 +-
daemon/remote.c | 2 +-
daemon/stream.c | 2 +-
docs/Makefile.am | 2 +-
po/POTFILES.in | 4 ++--
src/Makefile.am | 2 +-
src/conf/capabilities.c | 2 +-
src/conf/cpu_conf.c | 2 +-
src/conf/device_conf.c | 2 +-
src/conf/domain_conf.c | 2 +-
src/conf/domain_event.c | 2 +-
src/conf/interface_conf.c | 2 +-
src/conf/netdev_bandwidth_conf.c | 2 +-
src/conf/netdev_vlan_conf.c | 2 +-
src/conf/netdev_vport_profile_conf.c | 2 +-
src/conf/network_conf.c | 2 +-
src/conf/node_device_conf.c | 2 +-
src/conf/nwfilter_conf.c | 2 +-
src/conf/nwfilter_ipaddrmap.c | 2 +-
src/conf/nwfilter_params.c | 2 +-
src/conf/secret_conf.c | 2 +-
src/conf/snapshot_conf.c | 2 +-
src/conf/storage_conf.c | 2 +-
src/conf/storage_encryption_conf.c | 2 +-
src/conf/virconsole.c | 2 +-
src/cpu/cpu.h | 2 +-
src/datatypes.c | 2 +-
src/esx/esx_private.h | 2 +-
src/esx/esx_vi.h | 2 +-
src/fdstream.c | 2 +-
src/hyperv/hyperv_device_monitor.c | 2 +-
src/hyperv/hyperv_interface_driver.c | 2 +-
src/hyperv/hyperv_network_driver.c | 2 +-
src/hyperv/hyperv_nwfilter_driver.c | 2 +-
src/hyperv/hyperv_private.h | 2 +-
src/hyperv/hyperv_secret_driver.c | 2 +-
src/hyperv/hyperv_storage_driver.c | 2 +-
src/hyperv/hyperv_wmi.c | 2 +-
src/interface/interface_backend_netcf.c | 2 +-
src/interface/interface_backend_udev.c | 2 +-
src/libvirt-qemu.c | 2 +-
src/libvirt.c | 2 +-
src/libxl/libxl_conf.c | 2 +-
src/libxl/libxl_driver.c | 2 +-
src/locking/domain_lock.c | 2 +-
src/locking/lock_daemon.c | 2 +-
src/locking/lock_daemon_config.c | 2 +-
src/locking/lock_daemon_dispatch.c | 2 +-
src/locking/lock_driver_lockd.c | 2 +-
src/locking/lock_driver_sanlock.c | 2 +-
src/locking/lock_manager.c | 2 +-
src/lxc/lxc_cgroup.c | 2 +-
src/lxc/lxc_conf.c | 2 +-
src/lxc/lxc_container.c | 2 +-
src/lxc/lxc_controller.c | 2 +-
src/lxc/lxc_domain.c | 2 +-
src/lxc/lxc_driver.c | 2 +-
src/lxc/lxc_fuse.c | 2 +-
src/lxc/lxc_hostdev.c | 2 +-
src/lxc/lxc_monitor.c | 2 +-
src/lxc/lxc_process.c | 2 +-
src/network/bridge_driver.c | 2 +-
src/node_device/node_device_driver.c | 2 +-
src/node_device/node_device_hal.c | 2 +-
src/node_device/node_device_linux_sysfs.c | 2 +-
src/node_device/node_device_udev.c | 2 +-
src/nodeinfo.c | 2 +-
src/nwfilter/nwfilter_dhcpsnoop.c | 2 +-
src/nwfilter/nwfilter_driver.c | 2 +-
src/nwfilter/nwfilter_ebiptables_driver.c | 2 +-
src/nwfilter/nwfilter_gentech_driver.c | 2 +-
src/nwfilter/nwfilter_learnipaddr.c | 2 +-
src/openvz/openvz_conf.c | 2 +-
src/openvz/openvz_driver.c | 2 +-
src/openvz/openvz_util.c | 2 +-
src/parallels/parallels_driver.c | 2 +-
src/parallels/parallels_network.c | 2 +-
src/parallels/parallels_storage.c | 2 +-
src/parallels/parallels_utils.c | 2 +-
src/phyp/phyp_driver.c | 2 +-
src/qemu/qemu_agent.c | 2 +-
src/qemu/qemu_bridge_filter.c | 2 +-
src/qemu/qemu_capabilities.c | 2 +-
src/qemu/qemu_cgroup.c | 2 +-
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hostdev.c | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
src/qemu/qemu_migration.c | 2 +-
src/qemu/qemu_monitor.c | 2 +-
src/qemu/qemu_monitor_json.c | 2 +-
src/qemu/qemu_monitor_text.c | 2 +-
src/qemu/qemu_process.c | 2 +-
src/remote/remote_driver.c | 2 +-
src/rpc/virkeepalive.c | 2 +-
src/rpc/virnetclient.c | 2 +-
src/rpc/virnetclientprogram.c | 2 +-
src/rpc/virnetclientstream.c | 2 +-
src/rpc/virnetmessage.c | 2 +-
src/rpc/virnetsaslcontext.c | 2 +-
src/rpc/virnetserver.c | 2 +-
src/rpc/virnetserverclient.c | 2 +-
src/rpc/virnetservermdns.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/security/security_apparmor.c | 2 +-
src/security/security_dac.c | 2 +-
src/security/security_driver.c | 2 +-
src/security/security_manager.c | 2 +-
src/security/security_nop.c | 2 +-
src/security/security_selinux.c | 2 +-
src/security/security_stack.c | 2 +-
src/storage/storage_backend.c | 2 +-
src/storage/storage_backend_disk.c | 2 +-
src/storage/storage_backend_fs.c | 2 +-
src/storage/storage_backend_iscsi.c | 2 +-
src/storage/storage_backend_logical.c | 2 +-
src/storage/storage_backend_mpath.c | 2 +-
src/storage/storage_backend_rbd.c | 2 +-
src/storage/storage_backend_scsi.c | 2 +-
src/storage/storage_backend_sheepdog.c | 2 +-
src/storage/storage_driver.c | 2 +-
src/test/test_driver.c | 2 +-
src/uml/uml_conf.h | 2 +-
src/util/iohelper.c | 2 +-
src/util/viraudit.c | 2 +-
src/util/virauth.c | 2 +-
src/util/virauthconfig.c | 2 +-
src/util/vircommand.c | 2 +-
src/util/virconf.c | 2 +-
src/util/virdbus.c | 2 +-
src/util/virdnsmasq.c | 2 +-
src/util/virebtables.c | 2 +-
src/util/{virterror.c => virerror.c} | 2 +-
src/util/{virterror_internal.h => virerror.h} | 0
src/util/virevent.c | 2 +-
src/util/vireventpoll.c | 2 +-
src/util/virfile.c | 2 +-
src/util/virhash.c | 2 +-
src/util/virhook.c | 2 +-
src/util/virinitctl.c | 2 +-
src/util/viriptables.c | 2 +-
src/util/virjson.c | 2 +-
src/util/virkeyfile.c | 2 +-
src/util/virlockspace.c | 2 +-
src/util/virlog.c | 2 +-
src/util/virnetdev.c | 2 +-
src/util/virnetdevbandwidth.c | 2 +-
src/util/virnetdevbridge.c | 2 +-
src/util/virnetdevmacvlan.c | 2 +-
src/util/virnetdevopenvswitch.c | 2 +-
src/util/virnetdevtap.c | 4 ++--
src/util/virnetdevveth.c | 2 +-
src/util/virnetdevvlan.c | 2 +-
src/util/virnetdevvportprofile.c | 2 +-
src/util/virnetlink.c | 2 +-
src/util/virnodesuspend.c | 2 +-
src/util/virobject.c | 2 +-
src/util/virpci.c | 2 +-
src/util/virpidfile.c | 2 +-
src/util/virprocess.c | 2 +-
src/util/virrandom.c | 2 +-
src/util/virsexpr.c | 2 +-
src/util/virsocketaddr.c | 2 +-
src/util/virstatslinux.c | 2 +-
src/util/virstoragefile.c | 2 +-
src/util/virstring.c | 2 +-
src/util/virsysinfo.c | 2 +-
src/util/virthreadpool.c | 2 +-
src/util/virtime.c | 2 +-
src/util/virtypedparam.c | 2 +-
src/util/viruri.c | 2 +-
src/util/virusb.c | 2 +-
src/util/virutil.c | 2 +-
src/util/viruuid.c | 2 +-
src/util/virxml.c | 2 +-
src/vbox/vbox_MSCOMGlue.c | 2 +-
src/vbox/vbox_XPCOMCGlue.c | 2 +-
src/vbox/vbox_driver.c | 2 +-
src/vbox/vbox_tmpl.c | 2 +-
src/vmware/vmware_conf.c | 2 +-
src/vmware/vmware_driver.c | 2 +-
src/vmx/vmx.c | 2 +-
src/xen/block_stats.c | 2 +-
src/xen/xen_driver.c | 2 +-
src/xen/xen_hypervisor.c | 2 +-
src/xen/xen_inotify.c | 2 +-
src/xen/xend_internal.c | 2 +-
src/xen/xm_internal.c | 2 +-
src/xen/xs_internal.c | 2 +-
src/xenapi/xenapi_driver.c | 2 +-
src/xenapi/xenapi_driver_private.h | 2 +-
src/xenapi/xenapi_utils.c | 2 +-
src/xenxs/xen_sxpr.c | 2 +-
src/xenxs/xen_xm.c | 2 +-
tests/commandtest.c | 2 +-
tests/libvirtdconftest.c | 2 +-
tests/qemumonitorjsontest.c | 2 +-
tests/qemumonitortestutils.c | 2 +-
tests/securityselinuxtest.c | 2 +-
tests/testutils.c | 2 +-
tests/virauthconfigtest.c | 2 +-
tests/virdrivermoduletest.c | 2 +-
tests/virkeyfiletest.c | 2 +-
tests/virlockspacetest.c | 2 +-
tests/virnetmessagetest.c | 2 +-
tests/virnetsockettest.c | 2 +-
tests/virnettlscontexttest.c | 2 +-
tests/virstringtest.c | 2 +-
tests/virtimetest.c | 2 +-
tests/viruritest.c | 2 +-
tools/console.c | 2 +-
tools/virsh-domain.c | 2 +-
tools/virsh.c | 2 +-
tools/virsh.h | 2 +-
223 files changed, 224 insertions(+), 224 deletions(-)
rename src/util/{virterror.c => virerror.c} (99%)
rename src/util/{virterror_internal.h => virerror.h} (100%)
diff --git a/cfg.mk b/cfg.mk
index 38d72e8..f9270b0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -762,7 +762,7 @@ exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \
exclude_file_name_regexp--sc_po_check = ^(docs/|src/rpc/gendispatch\.pl$$)
exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \
- ^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virterror\.c)$$
+ ^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virerror\.c)$$
exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/virutil\.c$$
diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index b979a23..8b74bf1 100644
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -26,7 +26,7 @@
#include "libvirtd-config.h"
#include "virconf.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "rpc/virnetserver.h"
#include "configmake.h"
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 7ea968b..fa4d129 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -33,7 +33,7 @@
#include <locale.h>
#include "libvirt_internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virfile.h"
#include "virpidfile.h"
#include "virprocess.h"
diff --git a/daemon/remote.c b/daemon/remote.c
index 31a8377..8767c18 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -22,7 +22,7 @@
#include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#if HAVE_POLKIT0
# include <polkit/polkit.h>
diff --git a/daemon/stream.c b/daemon/stream.c
index f208139..4df1145 100644
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -28,7 +28,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "virnetserverclient.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_STREAMS
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 4fea3a0..cba9d4b 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -239,7 +239,7 @@ $(APIBUILD_STAMP): $(srcdir)/apibuild.py \
$(srcdir)/../include/libvirt/virterror.h \
$(srcdir)/../src/libvirt.c \
$(srcdir)/../src/libvirt-qemu.c \
- $(srcdir)/../src/util/virterror.c
+ $(srcdir)/../src/util/virerror.c
$(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD)
touch $@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 34290e1..4d94799 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -174,8 +174,8 @@ src/util/virsocketaddr.c
src/util/virstatslinux.c
src/util/virstoragefile.c
src/util/virsysinfo.c
-src/util/virterror.c
-src/util/virterror_internal.h
+src/util/virerror.c
+src/util/virerror.h
src/util/virtime.c
src/util/virtypedparam.c
src/util/viruri.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebfabe..2713bf2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ UTIL_SOURCES = \
util/virconf.c util/virconf.h \
util/virdnsmasq.c util/virdnsmasq.h \
util/virebtables.c util/virebtables.h \
+ util/virerror.c util/virerror.h \
util/virevent.c util/virevent.h \
util/vireventpoll.c util/vireventpoll.h \
util/virfile.c util/virfile.h \
@@ -86,7 +87,6 @@ UTIL_SOURCES = \
util/virthreadwin32.h \
util/virthreadpool.c util/virthreadpool.h \
util/virtypedparam.c util/virtypedparam.h \
- util/virterror.c util/virterror_internal.h \
util/vircgroup.c util/vircgroup.h \
util/virdbus.c util/virdbus.h \
util/virhash.c util/virhash.h \
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index ad9951b..365c511 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -31,7 +31,7 @@
#include "virutil.h"
#include "viruuid.h"
#include "cpu_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_CAPABILITIES
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 491a8c7..bdc5f1d 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virutil.h"
#include "virbuffer.h"
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index 45ecb28..099b1cb 100644
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -21,7 +21,7 @@
*/
#include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "viralloc.h"
#include "virxml.h"
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 08f14ca..cf53875 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -30,7 +30,7 @@
#include <unistd.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "domain_conf.h"
#include "snapshot_conf.h"
diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index d523808..96a07ac 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -27,7 +27,7 @@
#include "virlog.h"
#include "datatypes.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 3867274..9301ec0 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -22,7 +22,7 @@
*/
#include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "interface_conf.h"
diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index e64aeff..b830cd0 100644
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "netdev_bandwidth_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "viralloc.h"
#include "domain_conf.h"
diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c
index 8cee025..9207184 100644
--- a/src/conf/netdev_vlan_conf.c
+++ b/src/conf/netdev_vlan_conf.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "netdev_vlan_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index a9a38d7..701e17e 100644
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "netdev_vport_profile_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 2bd04c5..f949f79 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <dirent.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "network_conf.h"
#include "netdev_vport_profile_conf.h"
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 3c68011..53b6af2 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -26,7 +26,7 @@
#include <unistd.h>
#include <errno.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "viralloc.h"
diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 810de6c..ca22411 100644
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -40,7 +40,7 @@
#include "viruuid.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "nwfilter_params.h"
#include "nwfilter_conf.h"
diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c
index ddad49e..317069d 100644
--- a/src/conf/nwfilter_ipaddrmap.c
+++ b/src/conf/nwfilter_ipaddrmap.c
@@ -26,7 +26,7 @@
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "nwfilter_params.h"
#include "nwfilter_ipaddrmap.h"
diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index 1429952..7aebc8d 100644
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -26,7 +26,7 @@
#include "internal.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "nwfilter_params.h"
#include "domain_conf.h"
diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 46d2ae5..891af65 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -28,7 +28,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "secret_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "virxml.h"
#include "viruuid.h"
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index f7f8f63..201c586 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -45,7 +45,7 @@
#include "virutil.h"
#include "viruuid.h"
#include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virxml.h"
#define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 04b2581..7a39998 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -33,7 +33,7 @@
#include <fcntl.h>
#include <string.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "storage_conf.h"
#include "virstoragefile.h"
diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 35e9da4..88dff1b 100644
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -33,7 +33,7 @@
#include "storage_encryption_conf.h"
#include "virutil.h"
#include "virxml.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viruuid.h"
#include "virfile.h"
diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c
index 515c5fa..239e2d2 100644
--- a/src/conf/virconsole.c
+++ b/src/conf/virconsole.c
@@ -35,7 +35,7 @@
#include "viralloc.h"
#include "virpidfile.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 5153b62..e279072 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -24,7 +24,7 @@
#ifndef __VIR_CPU_H__
# define __VIR_CPU_H__
-# include "virterror_internal.h"
+# include "virerror.h"
# include "datatypes.h"
# include "virarch.h"
# include "conf/cpu_conf.h"
diff --git a/src/datatypes.c b/src/datatypes.c
index 038c47d..068233c 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -23,7 +23,7 @@
#include <unistd.h>
#include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "viralloc.h"
#include "viruuid.h"
diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h
index de6ba5d..f1e7adf 100644
--- a/src/esx/esx_private.h
+++ b/src/esx/esx_private.h
@@ -24,7 +24,7 @@
# define __ESX_PRIVATE_H__
# include "internal.h"
-# include "virterror_internal.h"
+# include "virerror.h"
# include "capabilities.h"
# include "esx_vi.h"
diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h
index a121d1c..3eaeb38 100644
--- a/src/esx/esx_vi.h
+++ b/src/esx/esx_vi.h
@@ -29,7 +29,7 @@
# include <curl/curl.h>
# include "internal.h"
-# include "virterror_internal.h"
+# include "virerror.h"
# include "datatypes.h"
# include "esx_vi_types.h"
# include "esx_util.h"
diff --git a/src/fdstream.c b/src/fdstream.c
index f7f101e..cc2dfe9 100644
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -33,7 +33,7 @@
#include <netinet/in.h>
#include "fdstream.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virlog.h"
#include "viralloc.h"
diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index 43ee1fc..9432081 100644
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 7dd6912..b42dbce 100644
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index f34a451..c75c943 100644
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index c6125ec..faa9074 100644
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h
index 30051ea..9c9fd3e 100644
--- a/src/hyperv/hyperv_private.h
+++ b/src/hyperv/hyperv_private.h
@@ -25,7 +25,7 @@
# define __HYPERV_PRIVATE_H__
# include "internal.h"
-# include "virterror_internal.h"
+# include "virerror.h"
# include "hyperv_util.h"
# include "openwsman.h"
diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index b830e4e..602ae99 100644
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 38385a0..a169b14 100644
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index e029028..33ba21f 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -25,7 +25,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virlog.h"
#include "viralloc.h"
diff --git a/src/interface/interface_backend_netcf.c
b/src/interface/interface_backend_netcf.c
index 74a749b..35335c2 100644
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -25,7 +25,7 @@
#include <netcf.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "interface_driver.h"
#include "interface_conf.h"
diff --git a/src/interface/interface_backend_udev.c
b/src/interface/interface_backend_udev.c
index 248b02e..cc20b98 100644
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -23,7 +23,7 @@
#include <dirent.h>
#include <libudev.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "interface_driver.h"
#include "interface_conf.h"
diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c
index 8d53b5c..11da2f3 100644
--- a/src/libvirt-qemu.c
+++ b/src/libvirt-qemu.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "datatypes.h"
#include "libvirt/libvirt-qemu.h"
diff --git a/src/libvirt.c b/src/libvirt.c
index e06b643..bf674d1 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -45,7 +45,7 @@
# include <curl/curl.h>
#endif
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "datatypes.h"
#include "driver.h"
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 8a1b21e..2705e65 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -32,7 +32,7 @@
#include "internal.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virfile.h"
#include "virstring.h"
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index c62ec3d..a956188 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -32,7 +32,7 @@
#include "internal.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virconf.h"
#include "datatypes.h"
#include "virfile.h"
diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 0354e26..6191e9b 100644
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -24,7 +24,7 @@
#include "domain_lock.h"
#include "viralloc.h"
#include "viruuid.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_LOCKING
diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index a445b2e..7288f7a 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -37,7 +37,7 @@
#include "virfile.h"
#include "virpidfile.h"
#include "virprocess.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "viralloc.h"
#include "virconf.h"
diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index e370dd4..12b06e2 100644
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -26,7 +26,7 @@
#include "lock_daemon_config.h"
#include "virconf.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "rpc/virnetserver.h"
#include "configmake.h"
diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index def7c2f..45d2cae 100644
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -30,7 +30,7 @@
#include "lock_daemon.h"
#include "lock_protocol.h"
#include "lock_daemon_dispatch_stubs.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index 9c7ce6d..4b72a05 100644
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -28,7 +28,7 @@
#include "viruuid.h"
#include "virutil.h"
#include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "rpc/virnetclient.h"
#include "lock_protocol.h"
#include "configmake.h"
diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 511543a..75ced84 100644
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -38,7 +38,7 @@
#include "dirname.h"
#include "lock_driver.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virutil.h"
#include "virfile.h"
diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index 1b88838..ae60caf 100644
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -23,7 +23,7 @@
#include "lock_manager.h"
#include "lock_driver_nop.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 74f3156..1984c5f 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -24,7 +24,7 @@
#include "lxc_cgroup.h"
#include "lxc_container.h"
#include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "viralloc.h"
#include "vircgroup.h"
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 866718c..90f5680 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -28,7 +28,7 @@
#include "lxc_conf.h"
#include "nodeinfo.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virconf.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 6769d33..d3a2968 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -53,7 +53,7 @@
# include <blkid/blkid.h>
#endif
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "lxc_container.h"
#include "virutil.h"
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 123db3c..c9d96b3 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -51,7 +51,7 @@
# include <numa.h>
#endif
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virutil.h"
diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index fab1506..1b02aa5 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -25,7 +25,7 @@
#include "viralloc.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 91d09c4..8050ce6 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -36,7 +36,7 @@
#include <unistd.h>
#include <wait.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "datatypes.h"
#include "lxc_cgroup.h"
diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c
index 485456e..fdba042 100644
--- a/src/lxc/lxc_fuse.c
+++ b/src/lxc/lxc_fuse.c
@@ -31,7 +31,7 @@
#include "lxc_fuse.h"
#include "lxc_cgroup.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virfile.h"
#include "virbuffer.h"
diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index f01fc56..21f3096 100644
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -26,7 +26,7 @@
#include "lxc_hostdev.h"
#include "viralloc.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index b0da21f..65194a5 100644
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -27,7 +27,7 @@
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virthread.h"
#include "rpc/virnetclient.h"
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 00bc1c6..1a89e4a 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -40,7 +40,7 @@
#include "network/bridge_driver.h"
#include "viralloc.h"
#include "domain_audit.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "vircommand.h"
#include "lxc_hostdev.h"
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 4bf8a2b..660c38d 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -44,7 +44,7 @@
#include <sys/ioctl.h>
#include <net/if.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "bridge_driver.h"
#include "network_conf.h"
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 6cc1837..522af99 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -30,7 +30,7 @@
#include <time.h>
#include <sys/stat.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 8ee816b..610df8d 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -30,7 +30,7 @@
#include "node_device_conf.h"
#include "node_device_hal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "driver.h"
#include "datatypes.h"
#include "viralloc.h"
diff --git a/src/node_device/node_device_linux_sysfs.c
b/src/node_device/node_device_linux_sysfs.c
index be5d3ed..9c305d3 100644
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -28,7 +28,7 @@
#include "node_device_driver.h"
#include "node_device_hal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 61e5a0e..a9b30b2 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -27,7 +27,7 @@
#include <c-ctype.h>
#include "node_device_udev.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "node_device_conf.h"
#include "node_device_driver.h"
#include "driver.h"
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index b47107c..0c1b479 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -44,7 +44,7 @@
#include "physmem.h"
#include "virutil.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "count-one-bits.h"
#include "intprops.h"
#include "virarch.h"
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index c1ab622..90b5615 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -57,7 +57,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "conf/domain_conf.h"
#include "nwfilter_gentech_driver.h"
#include "nwfilter_dhcpsnoop.h"
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 4b1188d..1ac91cf 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -32,7 +32,7 @@
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "viralloc.h"
#include "domain_conf.h"
diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c
b/src/nwfilter/nwfilter_ebiptables_driver.c
index 092ae5a..4fec52d 100644
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -33,7 +33,7 @@
#include "virbuffer.h"
#include "viralloc.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "domain_conf.h"
#include "nwfilter_conf.h"
#include "nwfilter_driver.h"
diff --git a/src/nwfilter/nwfilter_gentech_driver.c
b/src/nwfilter/nwfilter_gentech_driver.c
index 2b4cc8e..086bb13 100644
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -29,7 +29,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "domain_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "nwfilter_gentech_driver.h"
#include "nwfilter_ebiptables_driver.h"
#include "nwfilter_dhcpsnoop.h"
diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 442cc83..7a4f983 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -46,7 +46,7 @@
#include "virlog.h"
#include "datatypes.h"
#include "virnetdev.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virthread.h"
#include "conf/nwfilter_params.h"
#include "conf/domain_conf.h"
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index b5a5c87..09518d5 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -42,7 +42,7 @@
#include <string.h>
#include <sys/wait.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "openvz_conf.h"
#include "openvz_util.h"
#include "viruuid.h"
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index ca0e927..c6f814e 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -44,7 +44,7 @@
#include <stdio.h>
#include <sys/wait.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "openvz_driver.h"
#include "openvz_util.h"
diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index 51b22c9..dc69df2 100644
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -25,7 +25,7 @@
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "vircommand.h"
#include "datatypes.h"
#include "viralloc.h"
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 75cce68..6f33080 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -41,7 +41,7 @@
#include <sys/statvfs.h>
#include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virutil.h"
#include "virlog.h"
diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 4729f18..c5ece79 100644
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -24,7 +24,7 @@
#include "datatypes.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "md5.h"
#include "parallels_utils.h"
diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c
index 0e6c100..e768d88 100644
--- a/src/parallels/parallels_storage.c
+++ b/src/parallels/parallels_storage.c
@@ -34,7 +34,7 @@
#include "viralloc.h"
#include "configmake.h"
#include "virstoragefile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "parallels_utils.h"
diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index 9e317b1..dd2f0b7 100644
--- a/src/parallels/parallels_utils.c
+++ b/src/parallels/parallels_utils.c
@@ -25,7 +25,7 @@
#include <stdarg.h>
#include "vircommand.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virjson.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index df15253..8e26b0c 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -51,7 +51,7 @@
#include "virlog.h"
#include "driver.h"
#include "libvirt/libvirt.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viruuid.h"
#include "domain_conf.h"
#include "storage_conf.h"
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index ec1e300..bb421bd 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -36,7 +36,7 @@
#include "qemu_command.h"
#include "viralloc.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virjson.h"
#include "virfile.h"
#include "virprocess.h"
diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index 6d84f47..3bc1141 100644
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -26,7 +26,7 @@
#include "qemu_conf.h"
#include "qemu_driver.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "qemu_bridge_filter.h"
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6aba2bc..c8e56ed 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -26,7 +26,7 @@
#include "qemu_capabilities.h"
#include "viralloc.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "virfile.h"
#include "virpidfile.h"
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index a2ea5c6..7faf025 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -29,7 +29,7 @@
#include "vircgroup.h"
#include "virlog.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "domain_audit.h"
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1443840..02e2d08 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -30,8 +30,8 @@
#include "cpu/cpu.h"
#include "viralloc.h"
#include "virlog.h"
-#include "virterror_internal.h"
#include "virarch.h"
+#include "virerror.h"
#include "virutil.h"
#include "virfile.h"
#include "viruuid.h"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index ed18ac6..c6deb10 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -34,7 +34,7 @@
#include <sys/wait.h>
#include <arpa/inet.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "qemu_conf.h"
#include "qemu_command.h"
#include "qemu_capabilities.h"
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 46b7656..5d11f83 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -29,7 +29,7 @@
#include "qemu_migration.h"
#include "viralloc.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "c-ctype.h"
#include "cpu/cpu.h"
#include "viruuid.h"
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5b9fcf7..0058c8d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -58,7 +58,7 @@
#include "qemu_process.h"
#include "qemu_migration.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "datatypes.h"
#include "virbuffer.h"
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 307f3e0..174d125 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -25,7 +25,7 @@
#include "qemu_hostdev.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virpci.h"
#include "virusb.h"
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index b54dce1..19172e1 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -34,7 +34,7 @@
#include "domain_nwfilter.h"
#include "virlog.h"
#include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virpci.h"
#include "virfile.h"
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 6cd16e7..9c7247b 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -37,7 +37,7 @@
#include "domain_audit.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virutil.h"
#include "virfile.h"
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 5ca1f89..99642b6 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -31,7 +31,7 @@
#include "qemu_monitor.h"
#include "qemu_monitor_text.h"
#include "qemu_monitor_json.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 0137291..2d2d254 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -39,7 +39,7 @@
#include "virlog.h"
#include "driver.h"
#include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virjson.h"
#ifdef WITH_DTRACE_PROBES
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 82e9108..6506f9d 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -38,7 +38,7 @@
#include "virlog.h"
#include "driver.h"
#include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virbuffer.h"
#ifdef WITH_DTRACE_PROBES
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 2dd2416..eac6553 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -52,7 +52,7 @@
#include "datatypes.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virhook.h"
#include "virfile.h"
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ac7dc87..ae861cc 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -29,7 +29,7 @@
#include "virnetclient.h"
#include "virnetclientprogram.h"
#include "virnetclientstream.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "datatypes.h"
#include "domain_event.h"
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 18be350..a8ceff5 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -27,7 +27,7 @@
#include "virfile.h"
#include "virlog.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virnetsocket.h"
#include "virkeepaliveprotocol.h"
#include "virkeepalive.h"
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 9347f0b..208e2e9 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -35,7 +35,7 @@
#include "virfile.h"
#include "virlog.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index eff4a4c..a179b8d 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -29,7 +29,7 @@
#include "virnetprotocol.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virutil.h"
#include "virfile.h"
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 7e1f9c7..15ed91a 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -25,7 +25,7 @@
#include "virnetclientstream.h"
#include "virnetclient.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virthread.h"
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index b2da65b..b7330de 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -25,7 +25,7 @@
#include "virnetmessage.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virfile.h"
#include "virutil.h"
diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index cd30f4d..cbf7261 100644
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -25,7 +25,7 @@
#include "virnetsaslcontext.h"
#include "virnetmessage.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virthread.h"
#include "virlog.h"
diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 47a6293..5674309 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -30,7 +30,7 @@
#include "virnetserver.h"
#include "virlog.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virthread.h"
#include "virthreadpool.h"
#include "virutil.h"
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index f1eb69b..aefc511 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -30,7 +30,7 @@
#include "virnetserverclient.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virthread.h"
#include "virkeepalive.h"
diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index daef2b4..b6f8e8e 100644
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -43,7 +43,7 @@
#include "virnetservermdns.h"
#include "vireventpoll.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index a8f875c..3ac3809 100644
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -27,7 +27,7 @@
#include "virnetserverclient.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virfile.h"
#include "virthread.h"
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 9992983..7d671f0 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -26,7 +26,7 @@
#include "virnetserverservice.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virthread.h"
#define VIR_FROM_THIS VIR_FROM_RPC
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index a959c30..ef93892 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -43,7 +43,7 @@
#include "virnetsocket.h"
#include "virutil.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virfile.h"
#include "virthread.h"
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index ad8bd48..661860f 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -32,7 +32,7 @@
#include "configmake.h"
#include "virthread.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virobject.h"
#define VIR_FROM_THIS VIR_FROM_SSH
diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index b01de8c..56e372b 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -31,7 +31,7 @@
#include "virnettlscontext.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "virlog.h"
#include "virthread.h"
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 1784fea..5be33b9 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -39,7 +39,7 @@
#include "virthread.h"
#include "virutil.h"
#include "viruuid.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virfile.h"
#include "configmake.h"
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 3eb1e65..7331c91 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -40,7 +40,7 @@
#include "security_apparmor.h"
#include "virutil.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "viruuid.h"
#include "virpci.h"
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 5da4e73..deff024 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -24,7 +24,7 @@
#include <fcntl.h>
#include "security_dac.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 82d3ca9..319b86f 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -23,7 +23,7 @@
#include <config.h>
#include <string.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "security_driver.h"
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index d6a3f64..593c00b 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -26,7 +26,7 @@
#include "security_driver.h"
#include "security_stack.h"
#include "security_dac.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/security/security_nop.c b/src/security/security_nop.c
index 7bc8bba..b6eb3f6 100644
--- a/src/security/security_nop.c
+++ b/src/security/security_nop.c
@@ -21,7 +21,7 @@
#include "security_nop.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 947fb34..b5e1a9a 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -33,7 +33,7 @@
#include "security_driver.h"
#include "security_selinux.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 3412372..8e1e5f9 100644
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -22,7 +22,7 @@
#include "security_stack.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_SECURITY
diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index f98a7c0..df79b28 100644
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -46,7 +46,7 @@
#endif
#include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "viralloc.h"
#include "internal.h"
diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index aceb82b..4214e97 100644
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -26,7 +26,7 @@
#include <unistd.h>
#include <stdio.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "storage_backend_disk.h"
#include "virutil.h"
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 23fa0f5..2205371 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -41,7 +41,7 @@
# include <blkid/blkid.h>
#endif
-#include "virterror_internal.h"
+#include "virerror.h"
#include "storage_backend_fs.h"
#include "storage_conf.h"
#include "virstoragefile.h"
diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index e91c4b1..f374961 100644
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <sys/stat.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "storage_backend_scsi.h"
#include "storage_backend_iscsi.h"
#include "virutil.h"
diff --git a/src/storage/storage_backend_logical.c
b/src/storage/storage_backend_logical.c
index 83b517c..2734689 100644
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <fcntl.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "storage_backend_logical.h"
#include "storage_conf.h"
#include "vircommand.h"
diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index 0e5d032..b12b81f 100644
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -29,7 +29,7 @@
#include <libdevmapper.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "storage_conf.h"
#include "storage_backend.h"
#include "viralloc.h"
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 7dc46b0..f5c6b0f 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -22,7 +22,7 @@
#include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "storage_backend_rbd.h"
#include "storage_conf.h"
#include "virutil.h"
diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 1db8fdd..1a03c49 100644
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -28,7 +28,7 @@
#include <dirent.h>
#include <fcntl.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "storage_backend_scsi.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/storage/storage_backend_sheepdog.c
b/src/storage/storage_backend_sheepdog.c
index 1046ac9..cd18f33 100644
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -26,7 +26,7 @@
#include <config.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "storage_backend_sheepdog.h"
#include "storage_conf.h"
#include "vircommand.h"
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index d93617c..ff56f4f 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -36,7 +36,7 @@
#include <errno.h>
#include <string.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "driver.h"
#include "virutil.h"
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4716e41..3e082a4 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -32,7 +32,7 @@
#include <libxml/xmlsave.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "test_driver.h"
#include "virbuffer.h"
diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h
index dfa168e..a4e264f 100644
--- a/src/uml/uml_conf.h
+++ b/src/uml/uml_conf.h
@@ -29,7 +29,7 @@
# include "network_conf.h"
# include "domain_conf.h"
# include "domain_event.h"
-# include "virterror_internal.h"
+# include "virerror.h"
# include "virthread.h"
# include "vircommand.h"
# include "virhash.h"
diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 40b04f9..2230bcb 100644
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -37,7 +37,7 @@
#include "virthread.h"
#include "virfile.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "configmake.h"
#include "virrandom.h"
diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index 05189d5..04ac323 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <unistd.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "viraudit.h"
#include "virutil.h"
diff --git a/src/util/virauth.c b/src/util/virauth.c
index cbb16ec..c26e340 100644
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -29,7 +29,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "datatypes.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "configmake.h"
#include "virauthconfig.h"
diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index d60f7bf..1d1f084 100644
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -28,7 +28,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
struct _virAuthConfig {
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index d059586..c906f2a 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -35,7 +35,7 @@
#include "vircommand.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/util/virconf.c b/src/util/virconf.c
index 7e4c8c1..16ed2cb 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -30,7 +30,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virbuffer.h"
#include "virconf.h"
#include "virutil.h"
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index f45074c..127e57f 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -23,7 +23,7 @@
#include "virdbus.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virthread.h"
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index e9b0148..cadb457 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -44,7 +44,7 @@
#include "virutil.h"
#include "vircommand.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index edf4956..959599a 100644
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -43,7 +43,7 @@
#include "virebtables.h"
#include "vircommand.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virthread.h"
diff --git a/src/util/virterror.c b/src/util/virerror.c
similarity index 99%
rename from src/util/virterror.c
rename to src/util/virerror.c
index a586738..257880f 100644
--- a/src/util/virterror.c
+++ b/src/util/virerror.c
@@ -27,7 +27,7 @@
#include <string.h>
#include <stdarg.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virlog.h"
#include "viralloc.h"
diff --git a/src/util/virterror_internal.h b/src/util/virerror.h
similarity index 100%
rename from src/util/virterror_internal.h
rename to src/util/virerror.h
diff --git a/src/util/virevent.c b/src/util/virevent.c
index 573b4ac..a207a48 100644
--- a/src/util/virevent.c
+++ b/src/util/virevent.c
@@ -26,7 +26,7 @@
#include "virevent.h"
#include "vireventpoll.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include <stdlib.h>
diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index afb0e05..ac1bf8e 100644
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -37,7 +37,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virtime.h"
#define EVENT_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__)
diff --git a/src/util/virfile.c b/src/util/virfile.c
index f20ce64..50999aa 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -40,7 +40,7 @@
#include "vircommand.h"
#include "configmake.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virhash.c b/src/util/virhash.c
index a1234c4..2fe8751 100644
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <stdlib.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virhash.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/util/virhook.c b/src/util/virhook.c
index 5df6494..6458908 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virhook.h"
#include "virutil.h"
#include "virlog.h"
diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index f8ac673..1618ffa 100644
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -28,7 +28,7 @@
#include "internal.h"
#include "virinitctl.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "viralloc.h"
#include "virfile.h"
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index eb8acf5..5ff3a1e 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -41,7 +41,7 @@
#include "viriptables.h"
#include "vircommand.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virthread.h"
diff --git a/src/util/virjson.c b/src/util/virjson.c
index 4c9797c..2c412c2 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -25,7 +25,7 @@
#include "virjson.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virutil.h"
diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index 99e5cd7..d77e95d 100644
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -31,7 +31,7 @@
#include "virutil.h"
#include "virhash.h"
#include "virkeyfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_CONF
diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 81a1d81..9ada6a6 100644
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -24,7 +24,7 @@
#include "virlockspace.h"
#include "virlog.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "virfile.h"
#include "virhash.h"
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 43a59b4..d0e996d 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -40,7 +40,7 @@
# include <sys/un.h>
#endif
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "viralloc.h"
#include "virutil.h"
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 3ea0e39..ce02d2c 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -25,7 +25,7 @@
#include "virnetdev.h"
#include "virmacaddr.h"
#include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "vircommand.h"
#include "viralloc.h"
#include "virpci.h"
diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 9cc8858..2c5b63a 100644
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -25,7 +25,7 @@
#include "virnetdevbandwidth.h"
#include "vircommand.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 4de88e3..b87c601 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "virnetdevbridge.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include "virfile.h"
#include "viralloc.h"
diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 720a48a..a74db1e 100644
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -30,7 +30,7 @@
#include "virnetdevmacvlan.h"
#include "virmacaddr.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NET
diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index b876a4e..47c3db8 100644
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -26,7 +26,7 @@
#include "virnetdevopenvswitch.h"
#include "vircommand.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virmacaddr.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 3565bbd..a884de1 100644
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -27,9 +27,9 @@
#include "virnetdev.h"
#include "virnetdevbridge.h"
#include "virnetdevopenvswitch.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
#include "virutil.h"
diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index c6568b7..3f81655 100644
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -29,7 +29,7 @@
#include "viralloc.h"
#include "virlog.h"
#include "vircommand.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c
index 53c6b65..2fe2017 100644
--- a/src/util/virnetdevvlan.c
+++ b/src/util/virnetdevvlan.c
@@ -22,7 +22,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virnetdevvlan.h"
#include "viralloc.h"
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 60acabd..bb97e3a 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -23,7 +23,7 @@
#include <config.h>
#include "virnetdevvportprofile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#define VIR_FROM_THIS VIR_FROM_NET
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index fdd4c0d..0b36fdc 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -40,7 +40,7 @@
#include "viralloc.h"
#include "virthread.h"
#include "virmacaddr.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#ifndef SOL_NETLINK
# define SOL_NETLINK 270
diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index 878be1d..df40ccd 100644
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -28,7 +28,7 @@
#include "viralloc.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virobject.c b/src/util/virobject.c
index aca6182..f51b735 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -25,7 +25,7 @@
#include "virthread.h"
#include "viralloc.h"
#include "viratomic.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virpci.c b/src/util/virpci.c
index 8875aa6..83e9a7b 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -37,7 +37,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "vircommand.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virfile.h"
#define PCI_SYSFS "/sys/bus/pci/"
diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 29097e3..14c9f9f 100644
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -33,7 +33,7 @@
#include "virutil.h"
#include "intprops.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "c-ctype.h"
#include "areadlink.h"
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index b276643..e8001e5 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -28,7 +28,7 @@
#include <sched.h>
#include "virprocess.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
#include "virutil.h"
diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 1b6de6b..6c5bc91 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -30,7 +30,7 @@
#include "virthread.h"
#include "count-one-bits.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c
index 8b70404..18d3c2d 100644
--- a/src/util/virsexpr.c
+++ b/src/util/virsexpr.c
@@ -17,7 +17,7 @@
#include "c-ctype.h"
#include <errno.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virsexpr.h"
#include "virutil.h"
#include "viralloc.h"
diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 0f2f23d..7bc43a9 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -24,7 +24,7 @@
#include <config.h>
#include "virsocketaddr.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#include <netdb.h>
diff --git a/src/util/virstatslinux.c b/src/util/virstatslinux.c
index 135df75..3505b96 100644
--- a/src/util/virstatslinux.c
+++ b/src/util/virstatslinux.c
@@ -32,7 +32,7 @@
# include <unistd.h>
# include <regex.h>
-# include "virterror_internal.h"
+# include "virerror.h"
# include "datatypes.h"
# include "virutil.h"
# include "virstatslinux.h"
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index f183f19..4ff3e14 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -36,7 +36,7 @@
#endif
#include "dirname.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virfile.h"
#include "c-ctype.h"
diff --git a/src/util/virstring.c b/src/util/virstring.c
index 5607b3e..0420ca3 100644
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -24,7 +24,7 @@
#include "virstring.h"
#include "viralloc.h"
#include "virbuffer.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 607c601..a44cfb6 100644
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virsysinfo.h"
#include "virutil.h"
#include "virlog.h"
diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c
index 307cefb..12a43e1 100644
--- a/src/util/virthreadpool.c
+++ b/src/util/virthreadpool.c
@@ -28,7 +28,7 @@
#include "virthreadpool.h"
#include "viralloc.h"
#include "virthread.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virtime.c b/src/util/virtime.c
index c614380..b54a4e8 100644
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -39,7 +39,7 @@
#include "virtime.h"
#include "virutil.h"
#include "viralloc.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index 60fb485..33e6a09 100644
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -26,7 +26,7 @@
#include "viralloc.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/src/util/viruri.c b/src/util/viruri.c
index e59cd5a..2888cb0 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -24,7 +24,7 @@
#include "viralloc.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virbuffer.h"
#define VIR_FROM_THIS VIR_FROM_URI
diff --git a/src/util/virusb.c b/src/util/virusb.c
index 413cd63..86a7c92 100644
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -35,7 +35,7 @@
#include "virlog.h"
#include "viralloc.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define USB_SYSFS "/sys/bus/usb"
#define USB_ID_LEN 10 /* "1234 5678" */
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 9fb1c6f..a2ad725 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -75,7 +75,7 @@
#include "c-ctype.h"
#include "dirname.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virbuffer.h"
#include "virutil.h"
diff --git a/src/util/viruuid.c b/src/util/viruuid.c
index f4eb331..373c362 100644
--- a/src/util/viruuid.c
+++ b/src/util/viruuid.c
@@ -36,7 +36,7 @@
#include "c-ctype.h"
#include "internal.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "viralloc.h"
#include "virfile.h"
diff --git a/src/util/virxml.c b/src/util/virxml.c
index 02f7d1a..8f19054 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -30,7 +30,7 @@
#include <math.h> /* for isnan() */
#include <sys/stat.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virxml.h"
#include "virbuffer.h"
#include "virutil.h"
diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index 36539f6..b5fb821 100644
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -33,7 +33,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "vbox_MSCOMGlue.h"
#define VIR_FROM_THIS VIR_FROM_VBOX
diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 1954ddb..2b568e2 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -40,7 +40,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_VBOX
diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index f2a0c8f..736c895 100644
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -37,7 +37,7 @@
#include "virlog.h"
#include "vbox_driver.h"
#include "vbox_glue.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virutil.h"
#define VIR_FROM_THIS VIR_FROM_VBOX
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 597a7c5..2b3fa25 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -44,7 +44,7 @@
#include "domain_conf.h"
#include "snapshot_conf.h"
#include "network_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "domain_event.h"
#include "storage_conf.h"
#include "virstoragefile.h"
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 2cbdd7c..b514636 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -30,7 +30,7 @@
#include "nodeinfo.h"
#include "virfile.h"
#include "viruuid.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "vmx.h"
#include "vmware_conf.h"
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 67cdc88..3763f40 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -24,7 +24,7 @@
#include <fcntl.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virfile.h"
#include "viralloc.h"
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 552f578..c604bd2 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -26,7 +26,7 @@
#include <c-ctype.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virconf.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 3f7c97b..9f5823c 100644
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -38,7 +38,7 @@
# include <xs.h>
# endif
-# include "virterror_internal.h"
+# include "virerror.h"
# include "datatypes.h"
# include "virutil.h"
# include "block_stats.h"
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index c35695a..2ef2c57 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -39,7 +39,7 @@
#include <fcntl.h>
#include <xen/dom0_ops.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "datatypes.h"
#include "xen_driver.h"
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 9443d98..a770f53 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -62,7 +62,7 @@
/* required for shutdown flags */
#include <xen/sched.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "datatypes.h"
#include "driver.h"
diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 4cce25a..2043c74 100644
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -27,7 +27,7 @@
#include <dirent.h>
#include <sys/inotify.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "driver.h"
#include "viralloc.h"
diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 120e237..84a25e8 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -29,7 +29,7 @@
#include <netdb.h>
#include <errno.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "datatypes.h"
#include "xend_internal.h"
diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 0806e77..003e8f7 100644
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -35,7 +35,7 @@
#include <stdint.h>
#include <xen/dom0_ops.h>
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "xm_internal.h"
#include "xen_driver.h"
diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 20332df..9308522 100644
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -41,7 +41,7 @@
# include <xs.h>
#endif
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "driver.h"
#include "viralloc.h"
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 4df6c5b..b812aeb 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -28,7 +28,7 @@
#include <xen/api/xen_all.h>
#include "internal.h"
#include "domain_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virauth.h"
#include "virutil.h"
diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h
index 42684bd..7e5b6e7 100644
--- a/src/xenapi/xenapi_driver_private.h
+++ b/src/xenapi/xenapi_driver_private.h
@@ -25,7 +25,7 @@
# include <libxml/tree.h>
# include <xen/api/xen_common.h>
-# include "virterror_internal.h"
+# include "virerror.h"
/*# define PRINT_XML*/
# define VIR_FROM_THIS VIR_FROM_XENAPI
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 5c53b69..3b8384e 100644
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -27,7 +27,7 @@
#include <xen/api/xen_all.h>
#include "internal.h"
#include "domain_conf.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "datatypes.h"
#include "virutil.h"
#include "viruuid.h"
diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index b83ac58..83b7c74 100644
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -27,7 +27,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virconf.h"
#include "viralloc.h"
#include "verify.h"
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index d965d79..73ba06b 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -26,7 +26,7 @@
#include <config.h>
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virconf.h"
#include "viralloc.h"
#include "verify.h"
diff --git a/tests/commandtest.c b/tests/commandtest.c
index d6a285e..fd2b8c0 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -36,7 +36,7 @@
#include "vircommand.h"
#include "virfile.h"
#include "virpidfile.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index c1d94d2..fd033f8 100644
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -26,7 +26,7 @@
#include "daemon/libvirtd-config.h"
#include "virutil.h"
#include "c-ctype.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virlog.h"
#include "virconf.h"
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index e1b6c56..35f2da6 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -23,7 +23,7 @@
#include "testutilsqemu.h"
#include "qemumonitortestutils.h"
#include "virthread.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index b82eb5d..78eab29 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -32,7 +32,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 93742cf..0dff872 100644
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -33,7 +33,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virlog.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "security/security_manager.h"
diff --git a/tests/testutils.c b/tests/testutils.c
index d88af21..9c8f365 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -42,7 +42,7 @@
#include "viralloc.h"
#include "virutil.h"
#include "virthread.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virbuffer.h"
#include "virlog.h"
#include "vircommand.h"
diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 2ad237d..67c5de8 100644
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -25,7 +25,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index cab47d3..de8cf70 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -22,7 +22,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
#include "driver.h"
diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index 33f64c1..fb41840 100644
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -25,7 +25,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index c434f47..8673700 100644
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -26,7 +26,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index 4e7a1fd..e58fd1f 100644
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -25,7 +25,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 819257b..b968973 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -29,7 +29,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index d945181..a1e71dc 100644
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -28,7 +28,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
#include "virfile.h"
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 58ab843..86d8986 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -24,7 +24,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index 1c22d07..18f621a 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -25,7 +25,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tests/viruritest.c b/tests/viruritest.c
index ad59270..3cb88da 100644
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -25,7 +25,7 @@
#include "testutils.h"
#include "virutil.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "viralloc.h"
#include "virlog.h"
diff --git a/tools/console.c b/tools/console.c
index d024d38..29873ea 100644
--- a/tools/console.c
+++ b/tools/console.c
@@ -43,7 +43,7 @@
# include "virfile.h"
# include "viralloc.h"
# include "virthread.h"
-# include "virterror_internal.h"
+# include "virerror.h"
/*
* Convert given character to control character.
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 3a9cebe..f3da1d5 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -49,7 +49,7 @@
#include "virmacaddr.h"
#include "virstring.h"
#include "virsh-domain-monitor.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "virtypedparam.h"
#include "virxml.h"
diff --git a/tools/virsh.c b/tools/virsh.c
index 790cf56..283194a 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -54,7 +54,7 @@
#endif
#include "internal.h"
-#include "virterror_internal.h"
+#include "virerror.h"
#include "base64.h"
#include "virbuffer.h"
#include "console.h"
diff --git a/tools/virsh.h b/tools/virsh.h
index 6e6d3ee..ab7161f 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -34,7 +34,7 @@
# include <inttypes.h>
# include "internal.h"
-# include "virterror_internal.h"
+# include "virerror.h"
# include "virthread.h"
# include "virnetdevbandwidth.h"
--
1.7.11.7
5:55 a.m.
New subject: [libvirt] [PATCH v2 28/28] Sort util files in Makefile.am alphabetically
From: "Daniel P. Berrange" <berrange(a)redhat.com>
---
src/Makefile.am | 53 +++++++++++++++++++++++++++--------------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 2713bf2..f7a9b91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,41 +61,27 @@ UTIL_SOURCES = \
util/virauthconfig.c util/virauthconfig.h \
util/virbitmap.c util/virbitmap.h \
util/virbuffer.c util/virbuffer.h \
+ util/vircgroup.c util/vircgroup.h \
util/vircommand.c util/vircommand.h \
util/virconf.c util/virconf.h \
- util/virdnsmasq.c util/virdnsmasq.h \
+ util/virdbus.c util/virdbus.h \
+ util/virdnsmasq.c util/virdnsmasq.h \
util/virebtables.c util/virebtables.h \
util/virerror.c util/virerror.h \
util/virevent.c util/virevent.h \
util/vireventpoll.c util/vireventpoll.h \
util/virfile.c util/virfile.h \
+ util/virhash.c util/virhash.h \
+ util/virhashcode.c util/virhashcode.h \
util/virhook.c util/virhook.h \
- util/virnodesuspend.c util/virnodesuspend.h \
+ util/virinitctl.c util/virinitctl.h \
util/viriptables.c util/viriptables.h \
util/virjson.c util/virjson.h \
- util/virlog.c util/virlog.h \
- util/virobject.c util/virobject.h \
- util/virpci.c util/virpci.h \
- util/virpidfile.c util/virpidfile.h \
- util/virprocess.c util/virprocess.h \
- util/virsexpr.c util/virsexpr.h \
- 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/vircgroup.c util/vircgroup.h \
- util/virdbus.c util/virdbus.h \
- util/virhash.c util/virhash.h \
- util/virhashcode.c util/virhashcode.h \
- util/virinitctl.c util/virinitctl.h \
util/virkeycode.c util/virkeycode.h \
util/virkeyfile.c util/virkeyfile.h \
util/virkeymaps.h \
util/virlockspace.c util/virlockspace.h \
+ util/virlog.c util/virlog.h \
util/virmacaddr.h util/virmacaddr.c \
util/virnetdev.h util/virnetdev.c \
util/virnetdevbandwidth.h util/virnetdevbandwidth.c \
@@ -103,14 +89,28 @@ UTIL_SOURCES = \
util/virnetdevmacvlan.c util/virnetdevmacvlan.h \
util/virnetdevopenvswitch.h util/virnetdevopenvswitch.c \
util/virnetdevtap.h util/virnetdevtap.c \
- util/virnetdevveth.h util/virnetdevveth.c \
- util/virnetdevvlan.h util/virnetdevvlan.c \
+ util/virnetdevveth.h util/virnetdevveth.c \
+ util/virnetdevvlan.h util/virnetdevvlan.c \
util/virnetdevvportprofile.h util/virnetdevvportprofile.c \
util/virnetlink.c util/virnetlink.h \
+ util/virnodesuspend.c util/virnodesuspend.h \
+ util/virobject.c util/virobject.h \
+ util/virpci.c util/virpci.h \
+ util/virpidfile.c util/virpidfile.h \
+ util/virprocess.c util/virprocess.h \
util/virrandom.h util/virrandom.c \
- util/virsocketaddr.h util/virsocketaddr.c \
- util/virstring.h util/virstring.c \
- util/virtime.h util/virtime.c \
+ util/virsexpr.c util/virsexpr.h \
+ util/virsocketaddr.h util/virsocketaddr.c \
+ util/virstatslinux.c util/virstatslinux.h \
+ util/virstoragefile.c util/virstoragefile.h \
+ util/virstring.h util/virstring.c \
+ 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/virtime.h util/virtime.c \
+ util/virtypedparam.c util/virtypedparam.h \
util/virusb.c util/virusb.h \
util/viruri.h util/viruri.c \
util/virutil.c util/virutil.h \
@@ -118,6 +118,7 @@ UTIL_SOURCES = \
util/virxml.c util/virxml.h \
$(NULL)
+
EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
$(srcdir)/util/virkeycode-mapgen.py
--
1.7.11.7
9:08 a.m.
On Wed, Dec 19, 2012 at 11:55:20AM +0000, Daniel P. Berrange wrote:
Currently the files in src/util are 50/50 split between those
having a 'vir' prefix and those which don't. Finish the job
by remaining all remaining files to have a 'vir' prefix too,
guaranteeing that they can't clash with system headers[1].
The only case which was not a plain rename, was merging
processinfo.{c,h} into the virprocess.{c,h} since the
functionality logically belongs together.
At the end src/Makefile.am is updated to sort util files
alphabetically.
Left as further work - make sure all functions in these
files also have a 'vir' prefix. eg dnsmasq, ebtables,
iptables, usb and pci files are violators in this regard.
Also left, much of virutil.c should move into virfile.c
I have just gone though 1 to 15 included, ACK to that set
let's push rather sooner than later as this will be conflicting
with pending patches and we shouldn't have too many right now.
Only suggested addition is change the beginning comment description
of files like src/util/logging.c
to read
* virlog.c: internal logging and debugging
instead of
* logging.c: internal logging and debugging
I also wonder if virbuf, viralloc and virlog headers shouln't be
added directly to one of the internals as those are used by nearly
all modules under src/
Changes in v2:
- Rebased to latest GIT
- Turned on rename detection to make review easier
Daniel
[1] Not a theoretical problem - we already hit a clsah
on 'usb.h' before forcing us to use 'hostusb.h'
and 'memory.h' clashes with a system header but we
never noticed so far.
Someone else do 16 to 24 ? :-)
Daniel
--
Daniel Veillard | Open Source and Standards, Red Hat
veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
http://veillard.com/ | virtualization library http://libvirt.org/
11:47 a.m.
On Wed, Dec 19, 2012 at 11:08:43PM +0800, Daniel Veillard wrote:
On Wed, Dec 19, 2012 at 11:55:20AM +0000, Daniel P. Berrange wrote:
> Currently the files in src/util are 50/50 split between those
> having a 'vir' prefix and those which don't. Finish the job
> by remaining all remaining files to have a 'vir' prefix too,
> guaranteeing that they can't clash with system headers[1].
>
> The only case which was not a plain rename, was merging
> processinfo.{c,h} into the virprocess.{c,h} since the
> functionality logically belongs together.
>
> At the end src/Makefile.am is updated to sort util files
> alphabetically.
>
> Left as further work - make sure all functions in these
> files also have a 'vir' prefix. eg dnsmasq, ebtables,
> iptables, usb and pci files are violators in this regard.
>
> Also left, much of virutil.c should move into virfile.c
I have just gone though 1 to 15 included, ACK to that set
let's push rather sooner than later as this will be conflicting
with pending patches and we shouldn't have too many right now.
Only suggested addition is change the beginning comment description
of files like src/util/logging.c
to read
* virlog.c: internal logging and debugging
instead of
* logging.c: internal logging and debugging
Ah yes. I did all these changes using simple search & replace
of the #include lines, so missed out the places where comments
refer to the filenames. I'll deal with those manually.
I also wonder if virbuf, viralloc and virlog headers shouln't
be
added directly to one of the internals as those are used by nearly
all modules under src/
Yep, I've wondered about that myself on several occassions
too.
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
3:58 p.m.
On 12/19/2012 08:08 AM, Daniel Veillard wrote:
On Wed, Dec 19, 2012 at 11:55:20AM +0000, Daniel P. Berrange wrote:
> Currently the files in src/util are 50/50 split between those
> having a 'vir' prefix and those which don't. Finish the job
> by remaining all remaining files to have a 'vir' prefix too,
> guaranteeing that they can't clash with system headers[1].
>
Only suggested addition is change the beginning comment description
of files like src/util/logging.c
to read
* virlog.c: internal logging and debugging
instead of
* logging.c: internal logging and debugging
Similar comments to the rest of the series.
Someone else do 16 to 24 ? :-)
Done; ACK to the remainder of the series. Turning on git rename
detection made this review MUCH easier. There's still a lot of things
we can do further, but I see no problem with getting these patches in now.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
5:38 a.m.
New subject: [libvirt] IMPORTANT: Re: [PATCH v2 0/28] Rename files in src/util to have a 'vir' prefix
FYI, I have pushed this big rename series. If you have outstanding patches
GIT should be able to detect the rename and re-apply your changes to the
new files. You'll still see conflicts if you've touched the #include
lines of course. If GIT fails to deal with the renames, make sure that
your $HOME/.gitconfig has something like
[merge]
renamelimit = 5000
There are so many renamed files, that GIT gives up too easily in its
default settings.
Regards,
Daniel
On Wed, Dec 19, 2012 at 02:58:30PM -0700, Eric Blake wrote:
On 12/19/2012 08:08 AM, Daniel Veillard wrote:
> On Wed, Dec 19, 2012 at 11:55:20AM +0000, Daniel P. Berrange wrote:
>> Currently the files in src/util are 50/50 split between those
>> having a 'vir' prefix and those which don't. Finish the job
>> by remaining all remaining files to have a 'vir' prefix too,
>> guaranteeing that they can't clash with system headers[1].
>>
> Only suggested addition is change the beginning comment description
> of files like src/util/logging.c
> to read
> * virlog.c: internal logging and debugging
> instead of
> * logging.c: internal logging and debugging
Similar comments to the rest of the series.
> Someone else do 16 to 24 ? :-)
Done; ACK to the remainder of the series. Turning on git rename
detection made this review MUCH easier. There's still a lot of things
we can do further, but I see no problem with getting these patches in now.
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
4356
days inactive
4358
days old
32 comments
3 participants
participants (3)
-
Daniel P. Berrange -
Daniel Veillard -
Eric Blake