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