util: move virStorageFileBackend code into storage_file

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@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 59ae892b4c949d775e9155132107011133e7c60b..fd274e2c7a2d44dc0902ff72d89cddeb322dc4a7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -223,6 +223,7 @@
 @SRCDIR@src/storage/storage_backend_zfs.c
 @SRCDIR@src/storage/storage_driver.c
 @SRCDIR@src/storage/storage_util.c
+@SRCDIR@src/storage_file/storage_file_backend.c
 @SRCDIR@src/storage_file/storage_file_backend_fs.c
 @SRCDIR@src/storage_file/storage_file_backend_gluster.c
 @SRCDIR@src/storage_file/storage_source.c
@@ -306,7 +307,6 @@
 @SRCDIR@src/util/virsocketaddr.c
 @SRCDIR@src/util/virstorageencryption.c
 @SRCDIR@src/util/virstoragefile.c
-@SRCDIR@src/util/virstoragefilebackend.c
 @SRCDIR@src/util/virstoragefileprobe.c
 @SRCDIR@src/util/virstring.c
 @SRCDIR@src/util/virsysinfo.c

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 67a863467d4629bf1bfcc679f8c11296639f5b6d..e7af8f0599ba6d31b77e278e0c3bb6243507f94d 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1618,6 +1618,10 @@ virSecurityManagerVerify;
 virSecurityXATTRNamespaceDefined;
 
 
+# storage_file/storage_file_backend.h
+virStorageFileBackendRegister;
+
+
 # storage_file/storage_source.h
 virStorageFileAccess;
 virStorageFileChainLookup;
@@ -3210,10 +3214,6 @@ virStorageTypeFromString;
 virStorageTypeToString;
 
 
-# util/virstoragefilebackend.h
-virStorageFileBackendRegister;
-
-
 # util/virstoragefileprobe.h
 virStorageFileProbeFormat;
 virStorageFileProbeGetMetadata;

diff --git a/src/storage_file/meson.build b/src/storage_file/meson.build
index b0f06c3f915172a515a3a6b436949f9127713bcc..f02ea8549e27fec80421559b077454b31f55f900 100644 (file)
--- a/src/storage_file/meson.build
+++ b/src/storage_file/meson.build
@@ -1,5 +1,6 @@
 storage_file_sources = [
   'storage_source.c',
+  'storage_file_backend.c',
 ]
 
 stoarge_file_fs_sources = [

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 55c62b0212ae448e0b0a41c576fecaf5dd55a394..6e4b2f408bd5949a0b5beb4038916bc007fdcdb8 100644 (file)
--- 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 43b36e95bce433c3e470ff9fe7163c7087b492e5..ad0f66212c9ee4c2d4158c00044d97ed1016706b 100644 (file)
--- 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_backend_fs.c b/src/storage_file/storage_file_backend_fs.c
index 42e514e4377bdaa363436249a65730390e9789a9..7b114fdeb0d0d1f5d44e6c93ff4c29cb48b56338 100644 (file)
--- a/src/storage_file/storage_file_backend_fs.c
+++ b/src/storage_file/storage_file_backend_fs.c
@@ -25,9 +25,9 @@
 #include <fcntl.h>
 
 #include "virerror.h"
+#include "storage_file_backend.h"
 #include "storage_file_backend_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_backend_gluster.c b/src/storage_file/storage_file_backend_gluster.c
index e6ce8d4c928c6a32084802b4842588c7bf5903b1..9b3b783274e954932fd5dc4cec6747d817aa8031 100644 (file)
--- a/src/storage_file/storage_file_backend_gluster.c
+++ b/src/storage_file/storage_file_backend_gluster.c
@@ -23,12 +23,12 @@
 
 #include <glusterfs/api/glfs.h>
 
+#include "storage_file_backend.h"
 #include "storage_file_backend_gluster.h"
 #include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
 #include "virstoragefile.h"
-#include "virstoragefilebackend.h"
 #include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

diff --git a/src/storage_file/storage_source.c b/src/storage_file/storage_source.c
index b5e0bc5040762c606ee45dbd3140e3c002375c27..744d3e94fdd49706a1be29653854867e6e311189 100644 (file)
--- a/src/storage_file/storage_source.c
+++ b/src/storage_file/storage_source.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 
 #include "internal.h"
+#include "storage_file_backend.h"
 #include "storage_source.h"
 #include "viralloc.h"
 #include "virerror.h"
@@ -34,7 +35,6 @@
 #include "virlog.h"
 #include "virobject.h"
 #include "virstoragefile.h"
-#include "virstoragefilebackend.h"
 #include "virstoragefileprobe.h"
 #include "virstring.h"
 #include "viruri.h"

diff --git a/src/util/meson.build b/src/util/meson.build
index 9fb270fadd88f892782324c9c286b0bce13775ee..64c0f9df6d36f8c3b212f539197433b0a2197100 100644 (file)
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -90,7 +90,6 @@ util_sources = [
   'virsocketaddr.c',
   'virstorageencryption.c',
   'virstoragefile.c',
-  'virstoragefilebackend.c',
   'virstoragefileprobe.c',
   'virstring.c',
   'virsysinfo.c',