From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
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
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list