External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: move virStorageFileCheckCompat into conf

Browse Source 
It is not used anywhere else.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Pavel Hrdina 2020-12-07 13:34:18 +01:00
parent 780aa25fad
commit f1007b1eb4
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/conf/storage_conf.c
View File

@ -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 static virStorageVolDefPtr
virStorageVolDefParseXML(virStoragePoolDefPtr pool, virStorageVolDefParseXML(virStoragePoolDefPtr pool,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
@ -1424,7 +1445,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool,
} }
def->target.compat = virXPathString("string(./target/compat)", ctxt); def->target.compat = virXPathString("string(./target/compat)", ctxt);
if (virStorageFileCheckCompat(def->target.compat) < 0) if (virStorageCheckCompat(def->target.compat) < 0)
return NULL; return NULL;
if (virXPathNode("./target/nocow", ctxt)) if (virXPathNode("./target/nocow", ctxt))

24
src/util/virstoragefile.c
View File

@ -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: * virStorageSourceIsRelative:
* @src: storage source to check * @src: storage source to check

2
src/util/virstoragefile.h
View File

@ -513,8 +513,6 @@ int virStorageFileGetRelativeBackingPath(virStorageSourcePtr from,
char **relpath) char **relpath)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
int virStorageFileCheckCompat(const char *compat);
int virStorageSourceNewFromBackingAbsolute(const char *path, int virStorageSourceNewFromBackingAbsolute(const char *path,
virStorageSourcePtr *src); virStorageSourcePtr *src);