virStorageFileGetMetadataFromFD: Remove unused 'backingFormat' argument

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index f71abbd72956a8e49bacb5db217f24987989db57..8e43c7868df453997dc1598f1d784ad9420de153 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -3358,8 +3358,7 @@ storageBackendProbeTarget(virStorageSourcePtr target,
 
     if (!(meta = virStorageFileGetMetadataFromFD(target->path,
                                                  fd,
-                                                 VIR_STORAGE_FILE_AUTO,
-                                                 NULL)))
+                                                 VIR_STORAGE_FILE_AUTO)))
         return -1;
 
     if (meta->backingStoreRaw) {

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 94805e8741d4fb60ebad54ea92ca82006bb1e577..d5ac5970f158dd86df8e5d98c2cbc26de1bb63db 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1161,21 +1161,14 @@ virStorageFileGetMetadataFromBuf(const char *path,
 virStorageSourcePtr
 virStorageFileGetMetadataFromFD(const char *path,
                                 int fd,
-                                int format,
-                                int *backingFormat)
+                                int format)
 
 {
     ssize_t len = VIR_STORAGE_MAX_HEADER;
     struct stat sb;
-    int dummy;
     g_autofree char *buf = NULL;
     g_autoptr(virStorageSource) meta = NULL;
 
-    if (!backingFormat)
-        backingFormat = &dummy;
-
-    *backingFormat = VIR_STORAGE_FILE_NONE;
-
     if (fstat(fd, &sb) < 0) {
         virReportSystemError(errno,
                              _("cannot stat file '%s'"), path);
@@ -1206,9 +1199,6 @@ virStorageFileGetMetadataFromFD(const char *path,
     if (virStorageFileGetMetadataInternal(meta, buf, len) < 0)
         return NULL;
 
-    if (backingFormat)
-        *backingFormat = meta->backingStoreRawFormat;
-
     if (S_ISREG(sb.st_mode))
         meta->type = VIR_STORAGE_TYPE_FILE;
     else if (S_ISBLK(sb.st_mode))

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 32f2c82147b3f15564c7971692c7e142c584b6b4..5b995d54ab95b84ed692a059bc2fee3ba7a5532b 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -381,8 +381,7 @@ int virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid);
 
 virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path,
                                                     int fd,
-                                                    int format,
-                                                    int *backingFormat);
+                                                    int format);
 virStorageSourcePtr virStorageFileGetMetadataFromBuf(const char *path,
                                                      char *buf,
                                                      size_t len,