Rename buf.{c,h} to virbuffer.{c,h}

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index a6cab5857ff7939d68c0b97b348d3d1eb2bd847e..dfda3e79e789bfca0f6dd9fb24ab60d75b9608ee 100644 (file)
--- 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 7cdb5b73e1a05e56b846f0577842354c6ea68c49..76db89a65bac95d08b8378329b886bffc9288500 100644 (file)
--- 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 3cdbcaae90419e4b6eb4c9b90cb7cee44f2c6822..19b99c66951eb60cb80391820578cee95c6ccf30 100644 (file)
--- 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 3973c8319e8e95ae43bc44a7350013ec28c78438..9b865712643e9ff5bcc67603d87ad5a4c1126e2e 100644 (file)
--- 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 bd6dfd96f694a235d901cabfb62024ad974c0170..368c26ba7dfd8e88f60c8579a057cc340f926bb1 100644 (file)
--- 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 7b97f455877d75ea99c0b8ad0853ef39e5784fbb..daf57bc380f8fd35d3f88f5c4c223be2a64be0ca 100644 (file)
--- 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 5318738a1b8157a3848d84adfe818a8134aa7ef3..09d6be976ffbd4ad54558ad3bd171cc7db2aa172 100644 (file)
--- 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 f33d49178aad94bb388a8177fb6a1b8bed4ba4e9..51327bf331cb59b5893104389987aed255ae5f6e 100644 (file)
--- 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 fc3602a36cfc92f8201ce2fb0b4295a9c6ae15c3..738ef336ae32b15fc8fca868187ec9a31994e135 100644 (file)
--- 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 00801652329e9ae986442b3a5205d379cdac41ad..216a540c6da6f5c3b624368a1de91e48418879e7 100644 (file)
--- 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 81b0d8497576b2db4938479a0fd8c2f73b3c2ef3..19b50ccdbccfe4acbd5262e0f7e1a5373755b24c 100644 (file)
--- 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 d6d58ef7fe25ce13879ebddcfb91b06e8db8d307..15ecbd68650daeb453745e2050871587a1d11937 100644 (file)
--- 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 ff7366d11443e285f95f99fa09dc9ac6443019f7..42cb87e4004060db56ade3f1d36d8815efe15c1a 100644 (file)
--- 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 41fa8e45b7c0dc015d36f2372f389a9708c82262..50fcf0b59dadd6412671db9f7d5127ff44fb512e 100644 (file)
--- 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 805fbe7453acbd7281607f525828a89310415f49..d5970644149aa8eba178a5a6da445711f3026926 100644 (file)
--- 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 6c3ce54352193cc212b696481b3c1f8b4231af33..ac57796aea835e8eaffc7980d22b2ad8545ae62b 100644 (file)
--- 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 a6b4934089cc06cb449eafbb01c972ecec106834..ec67f57a7b08aa03ef536cb9bc254c56dd1c7527 100644 (file)
--- 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 95b7943d95054d6feea94f021d303f120321dbfe..38a3e2a36ad900049958e5a64b6a22183190af9e 100644 (file)
--- 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 ad0f0c108f681eca8840b25c3d1deeedf978ced9..b81c08cf974a8bbf30f566a166983d72d8cda8f4 100644 (file)
--- 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 a8b1397e123d2d03f225cea19b99fbe2769d536d..0c2bded1e5f5e4a79d736e25f0f6a625b75b8c7c 100644 (file)
--- 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 e06347847005af1dd78cd4634e2b9e90eff70fe7..40a84973c4274ded5c43402ad36fdcf6e766ec84 100644 (file)
--- 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 ac107892b51d61702b9c37f0ea176b082b82094e..36d601e952afe502c6777073ceaecef2a21bd932 100644 (file)
--- 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 cb2191025957be23c36ee0fec1e4002001e95ad9..144714155767362912d1644ac127948ea2ef5e04 100644 (file)
--- 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 564b35cfd6ab35f7d8c314d9f718df855ee647e0..d645bfbdcd31443064f3f80d3ac1fc392ef9adf8 100644 (file)
--- 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 0f9d612ca4bd3bb28a49a556ec6ff260140b7a92..a3c3c8b9784b67211231daa8ac07fbe2ea3e8065 100644 (file)
--- 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 01467285fc9bb59da96f1aaeba1b6d6b5b392a0d..1654e1b1731ab24c4dce0b39c33fd03c5f333c82 100644 (file)
--- 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 a250bf820efd002834e8aaf928920ecf39ec721a..92dc16f73ae493d033d33b70a65bb2eea343a91f 100644 (file)
--- 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 4023588b3204e0934fdadb1ae15661db1f4c2c51..0a6b1077780069b350cb3b9e8791cb378576af58 100644 (file)
--- 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 d9e8578833f8bb2cdb29b1eeccb0eb19415876ef..85a2bbc6fff8ddf9bf183862a87ccc602d9d80f4 100644 (file)
--- 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 e0c51aa1745ee6321bded19d9574d076702247da..4e7df552eaca3fdb7a358d90feca3dcd0ec4b685 100644 (file)
--- 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 9740fbd14321540ddbbe8256c863ba77db72073b..48c047e7c9cae37cebde63f570174e11f5557214 100644 (file)
--- 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 c9ca00c9f1344e45902b5a2a0088a2893e24cdc9..b3499fb3049079feea127e726b100f183663a536 100644 (file)
--- 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 cdf0efce54266ae2c9073765910359e950bbe5d4..5cfc0367249f2f3895c4ebffa3e583263588adb9 100644 (file)
--- 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 85e0e7e9bda2a9060b9f64e0cededa80d3d864ec..361bdce3b234fd48529340be92e5bfc5ec915d71 100644 (file)
--- 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 089f63b5c724df3ea8da70911a9833182492ffc5..30fd2e3e86ced24f91fd6ef062ffc93d329473f1 100644 (file)
--- 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 fd6ecf8aa13c95be56445b4a5203447354bf1c07..1e97448388d9f018e9b0b70e85be412f06d9e549 100644 (file)
--- 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 c82acb61473df057bf2ba5cef68fe3321e003d70..e81bc090fa9a629525df5ffaf85a17a049725512 100644 (file)
--- 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 d890ff15327446ecc59787fe82f198947a662b84..a796aa9cbd1ea5aa56bcabac3598eac162bfcb2a 100644 (file)
--- 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 7e8a1d8ef5a5deb48ce7adc44da553354840ae48..8c1fa6090495e54e5e05c275f72472f96f68e543 100644 (file)
--- 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 fa106005de9d6a73fe94aa7ef7b4cf54d3dd490a..a12adb65c6fc7beea9d54973279b86b750ce9c88 100644 (file)
--- 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 5cc7e32e42f06c4fec84fdf813c3d84c34fe1ea4..f32e88ea2f63bc593fe9d687aee43107db34a584 100644 (file)
--- 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 286cc4dd5611298487eacad63aab1f703d74e7a0..d89056967b715beb081e619104c089b1e3d758a3 100644 (file)
--- 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 16ce7f3d8ead59bab89991e615060697ca79e181..9035bbcc785c2bd19f31a3ea2550668d449f1d2e 100644 (file)
--- 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 256be92ebda80d25d8a0522bfd98567643a6d5ba..63066beab367ca261843e12a629cd4a984b9d766 100644 (file)
--- 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 7414969df100b2038a77658de01f305a2adab53c..2bc07a999a8e8f320f73a76bdd92233e7ef94df3 100644 (file)
--- 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 887dca63503458644ec910214e34c3b45fd3c44d..8dece668509e5e99cd1230f9cabd70d490d9a62e 100644 (file)
--- 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 ebdd63674042c50d2c565253a852c9ce3100dfb6..fbd9ff8e7df53d2c48f3c4969afd1399c087be54 100644 (file)
--- 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 177a0eb13509d341da9e9e446f9f0a212b2a4823..6c8ab49e6c02c0cf4730b7209ca095cc1ef305e6 100644 (file)
--- 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 ba8009770b4fe4508ba4dba5a4ca24888fd53fdd..3b975455c528f92717fd7329eb72e0a5f062bd42 100644 (file)
--- 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 e8fed55deb3fa8167d1c7156f6adbf472ca83d4c..0df354905a1b903f1d21bf3f59d49031ff9dc861 100644 (file)
--- 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 52feecc371c3ca1738c8a967492c72ca41544ffd..028b791ac930da3d1164b93882f022ab3e101cc3 100644 (file)
--- 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 b4b41edb6433b0e086716be00b55987739d0804e..13ec481f3ba761fdd900b2d8a150e736c0788417 100644 (file)
--- 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 40a100ae619a681e5c882923955fb20c6f1e6f32..0b1f000e9698a8708efe0675db8d7a1b9e40953f 100644 (file)
--- 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 05e7ca7d2626ec1cc1e73ad8351f36484fcad906..422ee7508a8ce3855e2ba5878afdbbf8c8e27b12 100644 (file)
--- 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 f63dd209c31f99e8b1e24dbc3299c2ebc538ce15..ec1483f104a3b1ef47c6274d57544ca4c8f54d13 100644 (file)
--- 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 e5406da7a204874f991613314755bb0d6820f90c..c856c529a69a2e944931e3ddca93485681e4c707 100644 (file)
--- a/src/util/buf.c
+++ b/src/util/virbuffer.c
@@ -1,5 +1,5 @@
 /*
- * buf.c: buffers for libvirt
+ * virbuffer.c: buffers for libvirt
  *
  * Copyright (C) 2005-2008, 2010-2012 Red Hat, Inc.
  *
@@ -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 98%
rename from src/util/buf.h
rename to src/util/virbuffer.h
index c3a498de051addc41256ab9f2f924ac0c2f9c72c..7b69c0e5cf0d1a3f36d7395faf525ac48db72d6a 100644 (file)
--- a/src/util/buf.h
+++ b/src/util/virbuffer.h
@@ -1,5 +1,5 @@
 /*
- * buf.h: buffers for libvirt
+ * virbuffer.h: buffers for libvirt
  *
  * Copyright (C) 2005-2008, 2011, 2012 Red Hat, Inc.
  *

diff --git a/src/util/virstring.c b/src/util/virstring.c
index 1917e9a6bd115df7265df206760480768e230ed5..228c3fb418f6809506fc5408c041b076fe13661f 100644 (file)
--- 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 26dbf2442052261fdb3c46e70285213da06d7105..dd3b87819a89836cdc01b5bb5c6b4c6545c19e22 100644 (file)
--- 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 84db8655da160312da30271ab848c7e102741ac5..5b08b1f0973b9b2f93c9c91419a36b7a5f3e0ea7 100644 (file)
--- 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 1a959cd4ee6f3f75f8e2bef30d5f027d035106e2..f7daaa61083708457eab86298cb6b50b00c4e206 100644 (file)
--- 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 922c571e23b97360737667351ad5cf0e4432db69..9407e95ad187aed73ed3d1f85c492595f5fa024d 100644 (file)
--- 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 59427881036ee1b4ffa5becdf35bd2ca4fd33f35..06c75e168ce5fae1c5803713db7e94edb1dc3faa 100644 (file)
--- 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 9da2974c710f98d2ebb84825242b0bb86c9cfa1b..2cd4b95e0206054736c107d2eddd0d037805df46 100644 (file)
--- 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 2d26cae11eca6cc89455903952dbfd9653e3c6a5..502c6534e615ae6638fec28e4453d9dea856c056 100644 (file)
--- 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 8c906f44f9ad2e39b4459ee1141aa3a51cd3fa8b..dbdb22d390c694085b120fb06a301b5e3b9345c3 100644 (file)
--- 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 c789d703e4bd913e792e656d0c91eb684aaf2d8f..4a54c9fce7ccfbc35f1fa6c0238beea42eb2e863 100644 (file)
--- 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 353bc7659c2880bb60f5b6084742f6b9a035171b..c5133766753dac33d4d8b6e6f4c138b86c692e5d 100644 (file)
--- 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 3d2e491df60434e2bb059371ae9732975f98b8b3..e8b48e86ee7f0b837dd59aab423694c51c9415d5 100644 (file)
--- 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 35ba9978744b2f8366ffe96fc2f3f5b1078e93ca..53b9bbe7493765ae9522e3d793a8225cdeb84c73 100644 (file)
--- 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 765f30c0cc93643c35e2053a9ab8b38501f3f23e..76d9d51c283ae4fd7315e65226be5162b3fdd0ee 100644 (file)
--- 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 3d13e016edfdc71f4dfeaf9615581ae41f15490d..f687780911014873b7e4c606ebba823060cb8cf8 100644 (file)
--- 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 3a6285bd20916d01180997867685e66dab831580..956fee8e244e39deee3ea797bdc563593d80918b 100644 (file)
--- 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 fd9d563ffcb483b3eaf21324c7b18092524beae0..c5d494a37ed203af9fb7f12a275e4780d443cdc4 100644 (file)
--- 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 8cf96bed05f8f6a67a939d7ed1319745fb2cc70a..52cd874cc1f2e6516c8d222357aa096b6ab02299 100644 (file)
--- 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 5e791917cf5a56ab286548b56d386a4c8f882926..3108d1b082bbff50c44d46f6f542da6290ab6bc6 100644 (file)
--- 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 5fee2cdedfd8747f64b169c4e7d714d21cde7a98..4a78467f384f104a105d49e8c6244c2ae71fc780 100644 (file)
--- 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 52879e11c42a0e6375eab3d1edb2e7ce9474edbe..ee79b972ea309d1a7fce2e838562d761e571ab13 100644 (file)
--- 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 8ec6456ed24bc13ac445672829cfae0a92741ee0..d6a381de883f24cec08b8dca0b78c0df19c8e830 100644 (file)
--- 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 21a2df08d821326eaf7a26535808acbdbdd58ae8..1bad6b1a3d232a4793f48ac8a6a5629e2d7439a6 100644 (file)
--- 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 2f7d4a36c7e1ded7480e33388e3a284149b7a5e1..82c03e4a23c1c87d1d32679fdc7e196b93a57930 100644 (file)
--- 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"