Rename storage_file.{c,h} to virstoragefile.{c,h}

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cf9c575dfb4b266319c66b5ea9c57cbe5d163655..9c142a486f1791c0afb9c02d6bcd674a4db56d68 100644 (file)
--- 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 2496f9c9c4379a0dbcaabff16c9b154e84b830d6..2e0c175d659256fceaa8e2c0cba7c80531e50bb4 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/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 721a7f33054b16be201add9faeef648e85e82a90..b42024ab1d6bc25874ab4477444a6bb7462a2146 100644 (file)
--- 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 01b76ecc95a42135ac8d78b8eb62f58758a45312..9c328a31363d41032ec91b423a01ee2d1435d92e 100644 (file)
--- 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 9c16a884d57f1b7c882cd9d16bb54cdae07b3c30..5c40e97fd584a2158445f83de309aaba23e60e3d 100644 (file)
--- 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 0e005888013d2252f3d6624d19d47dc64f828afa..5cd239394c0cc7fcc50378815b5b35267799c3f9 100644 (file)
--- 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 9d481d25b2e5678dc59f803d3bf4a737193cd959..5ad885a9f7ff63f01b3450522c1c0342c1ec3c16 100644 (file)
--- 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 bca637b5b18e3f6d480f533954891a8b86859e7c..4886fc3bb81eea7bba7bd04c870adf63e9beda12 100644 (file)
--- 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 5b20c395e91c8688b1e78aa74211faae8880d596..9117c9b6a9bf21c8714fe6dba4f67cce23db6aa8 100644 (file)
--- 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 e3d2711a7954d4febafd87e4927d9c9f8404a1d8..2ac01c4c3964a698f686c8005bb157db66d4b7b8 100644 (file)
--- 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 f546d28d6d36b90c0eebd440918016ec239f64a0..0e6c1007acf2710670c5dda34fabb02f370eef29 100644 (file)
--- 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 2a5b08d3cba4f87cde0385fc80c538aef83f1bd7..1926cfb9fba725506d75e0f6c87b8427abd3db9f 100644 (file)
--- 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 8dcadbc57951a9be98f28be7bf635e1c3c3ff54f..3e1081ae299d51b4cb224af4f2d94eede75f8ab1 100644 (file)
--- 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 d7bdd46460a6e59da82904a099f4b7a2b41ef4f5..b96d4a9544d3a1527855a0ccd56eaaaa5ca4308e 100644 (file)
--- 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 4874062f99a40bfa69413179ee5361af4ead0f81..b54dce1502cbdb11f87df2871dee648c023104f1 100644 (file)
--- 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 ff453beaef5cc7214f22a99fa70299d9cabea9a7..5494e20125f0ef002d749db4ee01687dfd667128 100644 (file)
--- 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 862e59092f39c070b5e606fadca84f178f164171..6a4e1b74326f429ba965ff5c66cc8728befb010d 100644 (file)
--- 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 46c92ca1f3cccf6827d8258f50da6cc3e42e6b75..3ed7ee5187826297ed60e4c5bb70e2861e5bc171 100644 (file)
--- 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 cdc5bda77b15dd62a2132faec9f0e46880a64bef..9b98dbb9000125f7e461a549b9a3f68894f8d7b0 100644 (file)
--- 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 f7b46566ab17a06dfbfa1d03ae3dff17eb89e40a..b744fb421b3b3177604833a8440cdc5d73344531 100644 (file)
--- 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 c070d94a420e933637e47fd02f392d2fb9a4523f..5d32995e1f69947dfb37c5c7be05488162d1e403 100644 (file)
--- 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 a020bb257778baa603e36917eab09950cc05ec5e..760e3a6abfa6fdd0c010af975cd3d675ff882e7a 100644 (file)
--- a/src/util/storage_file.c
+++ b/src/util/virstoragefile.c
@@ -1,5 +1,5 @@
 /*
- * storage_file.c: file utility functions for FS storage backend
+ * virstoragefile.c: file utility functions for FS storage backend
  *
  * Copyright (C) 2007-2012 Red Hat, Inc.
  * Copyright (C) 2007-2008 Daniel P. Berrange
@@ -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 98%
rename from src/util/storage_file.h
rename to src/util/virstoragefile.h
index 6fbd2758c2c9e27f050e803983f5b3385d49a779..6929fd01fe328ecb93c4f20b51dd76470a585977 100644 (file)
--- a/src/util/storage_file.h
+++ b/src/util/virstoragefile.h
@@ -1,5 +1,5 @@
 /*
- * storage_file.c: file utility functions for FS storage backend
+ * virstoragefile.h: file utility functions for FS storage backend
  *
  * Copyright (C) 2007-2009, 2012 Red Hat, Inc.
  * Copyright (C) 2007-2008 Daniel P. Berrange

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index e39a9de69c555805ec430037d6e6705660c10490..cb1698f9b04059567afc4b5581040126f40a74e3 100644 (file)
--- 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 0cbc248d50dda8e1cfd7ed054fd243dcc728d916..b28c538798ac192bd6569a230cce380113fa5945 100644 (file)
--- 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 2291c0211d56754723b16d1bebbd38dfdfc565d1..f48326440f249a5a3a056c63a1e8f558ddc73955 100644 (file)
--- 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,