[PATCH 12/12] util: Remove unused 'virStorageFileParseChainIndex'

Peter Krempa pkrempa at redhat.com
Mon Jan 25 16:05:24 UTC 2021


Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/libvirt_private.syms  |  1 -
 src/util/virstoragefile.c | 32 --------------------------------
 src/util/virstoragefile.h |  5 -----
 3 files changed, 38 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 0a2a54dfdf..4b6fca63d4 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3217,7 +3217,6 @@ virStorageFileCanonicalizePath;
 virStorageFileGetNPIVKey;
 virStorageFileGetSCSIKey;
 virStorageFileParseBackingStoreStr;
-virStorageFileParseChainIndex;


 # util/virstring.h
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index d1e56db708..9df891b57c 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -216,38 +216,6 @@ virStorageFileParseBackingStoreStr(const char *str,
 }


-int
-virStorageFileParseChainIndex(const char *diskTarget,
-                              const char *name,
-                              unsigned int *chainIndex)
-{
-    unsigned int idx = 0;
-    g_autofree char *target = NULL;
-
-    *chainIndex = 0;
-
-    if (!name || !diskTarget)
-        return 0;
-
-    if (virStorageFileParseBackingStoreStr(name, &target, &idx) < 0)
-        return 0;
-
-    if (idx == 0)
-        return 0;
-
-    if (STRNEQ(diskTarget, target)) {
-        virReportError(VIR_ERR_INVALID_ARG,
-                       _("requested target '%s' does not match target '%s'"),
-                       target, diskTarget);
-        return -1;
-    }
-
-    *chainIndex = idx;
-
-    return 0;
-}
-
-
 static char *
 virStorageFileCanonicalizeFormatPath(char **components,
                                      size_t ncomponents,
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 455a978a8d..6b198858cc 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -23,11 +23,6 @@

 #include "internal.h"

-int virStorageFileParseChainIndex(const char *diskTarget,
-                                  const char *name,
-                                  unsigned int *chainIndex)
-    ATTRIBUTE_NONNULL(3);
-
 int virStorageFileParseBackingStoreStr(const char *str,
                                        char **target,
                                        unsigned int *chainIndex)
-- 
2.29.2




More information about the libvir-list mailing list