util: move virStorageFileProbe code into storage_file

Same as virStorageFileBackend, it doesn't belong into 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 fd274e2c7a2d44dc0902ff72d89cddeb322dc4a7..db017fc5b7bc5e61fe5df2d2423a9d66ddc56416 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -226,6 +226,7 @@
 @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_file_probe.c
 @SRCDIR@src/storage_file/storage_source.c
 @SRCDIR@src/test/test_driver.c
 @SRCDIR@src/util/iohelper.c
@@ -307,7 +308,6 @@
 @SRCDIR@src/util/virsocketaddr.c
 @SRCDIR@src/util/virstorageencryption.c
 @SRCDIR@src/util/virstoragefile.c
-@SRCDIR@src/util/virstoragefileprobe.c
 @SRCDIR@src/util/virstring.c
 @SRCDIR@src/util/virsysinfo.c
 @SRCDIR@src/util/virsystemd.c

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index e7af8f0599ba6d31b77e278e0c3bb6243507f94d..b49eee37500b15de9724b14f2a0f5e9ef0efec3e 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1622,6 +1622,11 @@ virSecurityXATTRNamespaceDefined;
 virStorageFileBackendRegister;
 
 
+# storage_file/storage_file_probe.h
+virStorageFileProbeFormat;
+virStorageFileProbeGetMetadata;
+
+
 # storage_file/storage_source.h
 virStorageFileAccess;
 virStorageFileChainLookup;
@@ -3214,11 +3219,6 @@ virStorageTypeFromString;
 virStorageTypeToString;
 
 
-# util/virstoragefileprobe.h
-virStorageFileProbeFormat;
-virStorageFileProbeGetMetadata;
-
-
 # util/virstring.h
 virSkipSpaces;
 virSkipSpacesAndBackslash;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a5c2488f2c82bccf08aae54686b4f90bf46bcac9..5363af3f56f7405cce251c642ab5e00b7d07cb38 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -83,7 +83,7 @@
 #include "domain_nwfilter.h"
 #include "virhook.h"
 #include "virstoragefile.h"
-#include "virstoragefileprobe.h"
+#include "storage_file_probe.h"
 #include "storage_source.h"
 #include "virfile.h"
 #include "virfdstream.h"

diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c
index 782f8eb6117ffc6ff03c45fe4c7c3af8b39e23c7..554c76ddb42f74de0552441768d9adc963d21f2c 100644 (file)
--- a/src/storage/storage_backend_gluster.c
+++ b/src/storage/storage_backend_gluster.c
@@ -28,9 +28,9 @@
 #include "viralloc.h"
 #include "virerror.h"
 #include "virlog.h"
-#include "virstoragefileprobe.h"
 #include "virstring.h"
 #include "viruri.h"
+#include "storage_file_probe.h"
 #include "storage_util.h"
 #include "storage_source.h"
 

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index d51fa2b4c0cf3c6042672c353300241271cd3533..04f9a442f217b875ca9b0eb4c2c811b317db355b 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -62,7 +62,7 @@
 #include "vircrypto.h"
 #include "viruuid.h"
 #include "virstoragefile.h"
-#include "virstoragefileprobe.h"
+#include "storage_file_probe.h"
 #include "storage_util.h"
 #include "storage_source.h"
 #include "virlog.h"

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

diff --git a/src/util/virstoragefileprobe.c b/src/storage_file/storage_file_probe.c
similarity index 99%
rename from src/util/virstoragefileprobe.c
rename to src/storage_file/storage_file_probe.c
index bca098cd357a7682fa9248d4feb348a15e42fa6e..e5e1b272ac59e9d1b0e338e871c70bfbbfcbd17f 100644 (file)
--- a/src/util/virstoragefileprobe.c
+++ b/src/storage_file/storage_file_probe.c
@@ -1,5 +1,5 @@
 /*
- * virstoragefileprobe.c: file utility functions for FS storage backend
+ * storage_file_probe.c: file utility functions for FS storage backend
  *
  * Copyright (C) 2007-2017 Red Hat, Inc.
  * Copyright (C) 2007-2008 Daniel P. Berrange
@@ -26,17 +26,17 @@
 #include <fcntl.h>
 
 #include "internal.h"
+#include "storage_file_probe.h"
 #include "viralloc.h"
 #include "virbitmap.h"
 #include "virendian.h"
 #include "virfile.h"
 #include "virlog.h"
 #include "virstoragefile.h"
-#include "virstoragefileprobe.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 
-VIR_LOG_INIT("util.storagefileprobe");
+VIR_LOG_INIT("storage_file.storagefileprobe");
 
 enum lv_endian {
     LV_LITTLE_ENDIAN = 1, /* 1234 */

diff --git a/src/util/virstoragefileprobe.h b/src/storage_file/storage_file_probe.h
similarity index 95%
rename from src/util/virstoragefileprobe.h
rename to src/storage_file/storage_file_probe.h
index 2b94a4ae51a8be32f3ebfcf8e903a5542c6cec01..c443c11606a1e80fca9ba2842869bd61a9772d21 100644 (file)
--- a/src/util/virstoragefileprobe.h
+++ b/src/storage_file/storage_file_probe.h
@@ -1,5 +1,5 @@
 /*
- * virstoragefileprobe.h: file utility functions for FS storage backend
+ * storage_file_probe.h: file utility functions for FS storage backend
  *
  * Copyright (C) 2007-2009, 2012-2016 Red Hat, Inc.
  * Copyright (C) 2007-2008 Daniel P. Berrange

diff --git a/src/storage_file/storage_source.c b/src/storage_file/storage_source.c
index 744d3e94fdd49706a1be29653854867e6e311189..d1e0aeb2c1a462d1ba920f638b037b82c1d9fb40 100644 (file)
--- a/src/storage_file/storage_source.c
+++ b/src/storage_file/storage_source.c
@@ -26,6 +26,7 @@
 
 #include "internal.h"
 #include "storage_file_backend.h"
+#include "storage_file_probe.h"
 #include "storage_source.h"
 #include "viralloc.h"
 #include "virerror.h"
@@ -35,7 +36,6 @@
 #include "virlog.h"
 #include "virobject.h"
 #include "virstoragefile.h"
-#include "virstoragefileprobe.h"
 #include "virstring.h"
 #include "viruri.h"
 #include "virutil.h"

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