9:55 a.m.
It's used only by storage file code so it doesn't make sense to have
it in util directory.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
po/POTFILES.in | 2 +-
src/libvirt_private.syms | 8 ++++----
src/storage_file/meson.build | 3 ++-
src/storage_file/storage_file.c | 2 +-
.../storage_file_backend.c} | 4 ++--
.../storage_file_backend.h} | 2 +-
src/storage_file/storage_file_fs.c | 2 +-
src/storage_file/storage_file_gluster.c | 2 +-
src/util/meson.build | 1 -
9 files changed, 13 insertions(+), 13 deletions(-)
rename src/{util/virstoragefilebackend.c => storage_file/storage_file_backend.c}
(97%)
rename src/{util/virstoragefilebackend.h => storage_file/storage_file_backend.h}
(97%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6d6678bd36..d3a0f85d91 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -224,6 +224,7 @@
@SRCDIR(a)src/storage/storage_driver.c
@SRCDIR(a)src/storage/storage_util.c
@SRCDIR(a)src/storage_file/storage_file.c
+@SRCDIR(a)src/storage_file/storage_file_backend.c
@SRCDIR(a)src/storage_file/storage_file_fs.c
@SRCDIR(a)src/storage_file/storage_file_gluster.c
@SRCDIR(a)src/test/test_driver.c
@@ -306,7 +307,6 @@
@SRCDIR(a)src/util/virsocketaddr.c
@SRCDIR(a)src/util/virstorageencryption.c
@SRCDIR(a)src/util/virstoragefile.c
-@SRCDIR(a)src/util/virstoragefilebackend.c
@SRCDIR(a)src/util/virstring.c
@SRCDIR(a)src/util/virsysinfo.c
@SRCDIR(a)src/util/virsystemd.c
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 43be8dd61a..fe6683f728 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1655,6 +1655,10 @@ virStorageSourceUpdateCapacity;
virStorageSourceUpdatePhysicalSize;
+# storage_file/storage_file_backend.h
+virStorageFileBackendRegister;
+
+
# util/glibcompat.h
vir_g_canonicalize_filename;
vir_g_fsync;
@@ -3211,10 +3215,6 @@ virStorageTypeFromString;
virStorageTypeToString;
-# util/virstoragefilebackend.h
-virStorageFileBackendRegister;
-
-
# util/virstring.h
virSkipSpaces;
virSkipSpacesAndBackslash;
diff --git a/src/storage_file/meson.build b/src/storage_file/meson.build
index b25ca63b40..4d85d16929 100644
--- a/src/storage_file/meson.build
+++ b/src/storage_file/meson.build
@@ -1,5 +1,6 @@
storage_file_sources = [
- 'storage_file.c'
+ 'storage_file.c',
+ 'storage_file_backend.c',
]
stoarge_file_fs_sources = [
diff --git a/src/storage_file/storage_file.c b/src/storage_file/storage_file.c
index 6bfeb26233..e5b2f68420 100644
--- a/src/storage_file/storage_file.c
+++ b/src/storage_file/storage_file.c
@@ -25,13 +25,13 @@
#include <unistd.h>
#include "storage_file.h"
+#include "storage_file_backend.h"
#include "viralloc.h"
#include "virendian.h"
#include "virfile.h"
#include "virhash.h"
#include "virjson.h"
#include "virlog.h"
-#include "virstoragefilebackend.h"
#include "virstring.h"
#include "viruri.h"
diff --git a/src/util/virstoragefilebackend.c b/src/storage_file/storage_file_backend.c
similarity index 97%
rename from src/util/virstoragefilebackend.c
rename to src/storage_file/storage_file_backend.c
index 55c62b0212..6e4b2f408b 100644
--- a/src/util/virstoragefilebackend.c
+++ b/src/storage_file/storage_file_backend.c
@@ -1,5 +1,5 @@
/*
- * virstoragefilebackend.c: internal storage source backend contract
+ * storage_file_backend.c: internal storage source backend contract
*
* Copyright (C) 2007-2018 Red Hat, Inc.
* Copyright (C) 2007-2008 Daniel P. Berrange
@@ -27,7 +27,7 @@
#include "virerror.h"
#include "viralloc.h"
#include "internal.h"
-#include "virstoragefilebackend.h"
+#include "storage_file_backend.h"
#include "virlog.h"
#include "virmodule.h"
#include "virfile.h"
diff --git a/src/util/virstoragefilebackend.h b/src/storage_file/storage_file_backend.h
similarity index 97%
rename from src/util/virstoragefilebackend.h
rename to src/storage_file/storage_file_backend.h
index 43b36e95bc..ad0f66212c 100644
--- a/src/util/virstoragefilebackend.h
+++ b/src/storage_file/storage_file_backend.h
@@ -1,5 +1,5 @@
/*
- * virstoragefilebackend.h: internal storage source backend contract
+ * storage_file_backend.h: internal storage source backend contract
*
* Copyright (C) 2007-2018 Red Hat, Inc.
*
diff --git a/src/storage_file/storage_file_fs.c b/src/storage_file/storage_file_fs.c
index 5a44ef8c2d..1cc9233512 100644
--- a/src/storage_file/storage_file_fs.c
+++ b/src/storage_file/storage_file_fs.c
@@ -25,9 +25,9 @@
#include <fcntl.h>
#include "virerror.h"
+#include "storage_file_backend.h"
#include "storage_file_fs.h"
#include "storage_util.h"
-#include "virstoragefilebackend.h"
#include "vircommand.h"
#include "viralloc.h"
#include "virfile.h"
diff --git a/src/storage_file/storage_file_gluster.c
b/src/storage_file/storage_file_gluster.c
index 599afada2c..786b39b6de 100644
--- a/src/storage_file/storage_file_gluster.c
+++ b/src/storage_file/storage_file_gluster.c
@@ -24,11 +24,11 @@
#include <glusterfs/api/glfs.h>
#include "storage_file.h"
+#include "storage_file_backend.h"
#include "storage_file_gluster.h"
#include "viralloc.h"
#include "virerror.h"
#include "virlog.h"
-#include "virstoragefilebackend.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_STORAGE
diff --git a/src/util/meson.build b/src/util/meson.build
index 395e70fd38..b510f0ebe9 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -90,7 +90,6 @@ util_sources = [
'virsocketaddr.c',
'virstorageencryption.c',
'virstoragefile.c',
- 'virstoragefilebackend.c',
'virstring.c',
'virsysinfo.c',
'virsystemd.c',
--
2.28.0