[libvirt PATCH 05/17] util: move virStorageFileCheckCompat into conf
It is not used anywhere else.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/storage_conf.c | 23 ++++++++++++++++++++++-
src/util/virstoragefile.c | 24 ------------------------
src/util/virstoragefile.h | 2 --
3 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 09769e6c79..0c50529ace 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -1296,6 +1296,27 @@ virStorageSize(const char *unit,
}
+static int
+virStorageCheckCompat(const char *compat)
+{
+ unsigned int result;
+ g_auto(GStrv) version = NULL;
+
+ if (!compat)
+ return 0;
+
+ version = virStringSplit(compat, ".", 2);
+ if (!version || !version[1] ||
+ virStrToLong_ui(version[0], NULL, 10, &result) < 0 ||
+ virStrToLong_ui(version[1], NULL, 10, &result) < 0) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("forbidden characters in 'compat'
attribute"));
+ return -1;
+ }
+ return 0;
+}
+
+
static virStorageVolDefPtr
virStorageVolDefParseXML(virStoragePoolDefPtr pool,
xmlXPathContextPtr ctxt,
@@ -1424,7 +1445,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool,
}
def->target.compat = virXPathString("string(./target/compat)", ctxt);
- if (virStorageFileCheckCompat(def->target.compat) < 0)
+ if (virStorageCheckCompat(def->target.compat) < 0)
return NULL;
if (virXPathNode("./target/nocow", ctxt))
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index bc342cabe3..d6ff47e4a7 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -4410,30 +4410,6 @@ virStorageFileGetRelativeBackingPath(virStorageSourcePtr top,
}
-/*
- * virStorageFileCheckCompat
- */
-int
-virStorageFileCheckCompat(const char *compat)
-{
- unsigned int result;
- g_auto(GStrv) version = NULL;
-
- if (!compat)
- return 0;
-
- version = virStringSplit(compat, ".", 2);
- if (!version || !version[1] ||
- virStrToLong_ui(version[0], NULL, 10, &result) < 0 ||
- virStrToLong_ui(version[1], NULL, 10, &result) < 0) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("forbidden characters in 'compat'
attribute"));
- return -1;
- }
- return 0;
-}
-
-
/**
* virStorageSourceIsRelative:
* @src: storage source to check
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 31feb22f26..ec34f2d899 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -513,8 +513,6 @@ int virStorageFileGetRelativeBackingPath(virStorageSourcePtr from,
char **relpath)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
-int virStorageFileCheckCompat(const char *compat);
-
int virStorageSourceNewFromBackingAbsolute(const char *path,
virStorageSourcePtr *src);
--
2.28.0