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>

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

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;

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"

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"
 

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"

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 = [

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 */

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

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"

src/util/meson.build

@@ -90,7 +90,6 @@ util_sources = [
   'virsocketaddr.c',
   'virstorageencryption.c',
   'virstoragefile.c',
-  'virstoragefileprobe.c',
   'virstring.c',
   'virsysinfo.c',
   'virsystemd.c',