mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
util: storage: Split out useful bits of virStorageFileParseChainIndex
The function has very specific semantics. Split out the part that parses the backing store specification string into a separate helper so that it can be reused later while keeping the wrapper with existing semantics. Note that virStorageFileParseChainIndex is pretty well covered by the test suite.
This commit is contained in:
parent
91e7862c15
commit
ad36f3853b
@ -2495,6 +2495,7 @@ virStorageFileGetMetadataInternal;
|
|||||||
virStorageFileGetRelativeBackingPath;
|
virStorageFileGetRelativeBackingPath;
|
||||||
virStorageFileGetSCSIKey;
|
virStorageFileGetSCSIKey;
|
||||||
virStorageFileIsClusterFS;
|
virStorageFileIsClusterFS;
|
||||||
|
virStorageFileParseBackingStoreStr;
|
||||||
virStorageFileParseChainIndex;
|
virStorageFileParseChainIndex;
|
||||||
virStorageFileProbeFormat;
|
virStorageFileProbeFormat;
|
||||||
virStorageFileResize;
|
virStorageFileResize;
|
||||||
|
@ -1442,32 +1442,78 @@ int virStorageFileGetSCSIKey(const char *path,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* virStorageFileParseBackingStoreStr:
|
||||||
|
* @str: backing store specifier string to parse
|
||||||
|
* @target: returns target device portion of the string
|
||||||
|
* @chainIndex: returns the backing store portion of the string
|
||||||
|
*
|
||||||
|
* Parses the backing store specifier string such as vda[1], or sda into
|
||||||
|
* components and returns them via arguments. If the string did not specify an
|
||||||
|
* index, 0 is assumed.
|
||||||
|
*
|
||||||
|
* Returns 0 on success -1 on error
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
virStorageFileParseBackingStoreStr(const char *str,
|
||||||
|
char **target,
|
||||||
|
unsigned int *chainIndex)
|
||||||
|
{
|
||||||
|
char **strings = NULL;
|
||||||
|
size_t nstrings;
|
||||||
|
unsigned int idx = 0;
|
||||||
|
char *suffix;
|
||||||
|
int ret = -1;
|
||||||
|
|
||||||
|
*chainIndex = 0;
|
||||||
|
|
||||||
|
if (!(strings = virStringSplitCount(str, "[", 2, &nstrings)))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (nstrings == 2) {
|
||||||
|
if (virStrToLong_uip(strings[1], &suffix, 10, &idx) < 0 ||
|
||||||
|
STRNEQ(suffix, "]"))
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (target &&
|
||||||
|
VIR_STRDUP(*target, strings[0]) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
*chainIndex = idx;
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
virStringListFreeCount(strings, nstrings);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
virStorageFileParseChainIndex(const char *diskTarget,
|
virStorageFileParseChainIndex(const char *diskTarget,
|
||||||
const char *name,
|
const char *name,
|
||||||
unsigned int *chainIndex)
|
unsigned int *chainIndex)
|
||||||
{
|
{
|
||||||
char **strings = NULL;
|
|
||||||
unsigned int idx = 0;
|
unsigned int idx = 0;
|
||||||
char *suffix;
|
char *target = NULL;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
*chainIndex = 0;
|
*chainIndex = 0;
|
||||||
|
|
||||||
if (name && diskTarget)
|
if (!name || !diskTarget)
|
||||||
strings = virStringSplit(name, "[", 2);
|
return 0;
|
||||||
|
|
||||||
if (virStringListLength((const char * const *)strings) != 2)
|
if (virStorageFileParseBackingStoreStr(name, &target, &idx) < 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (idx == 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (virStrToLong_uip(strings[1], &suffix, 10, &idx) < 0 ||
|
if (STRNEQ(diskTarget, target)) {
|
||||||
STRNEQ(suffix, "]"))
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
if (STRNEQ(diskTarget, strings[0])) {
|
|
||||||
virReportError(VIR_ERR_INVALID_ARG,
|
virReportError(VIR_ERR_INVALID_ARG,
|
||||||
_("requested target '%s' does not match target '%s'"),
|
_("requested target '%s' does not match target '%s'"),
|
||||||
strings[0], diskTarget);
|
target, diskTarget);
|
||||||
ret = -1;
|
ret = -1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@ -1475,7 +1521,7 @@ virStorageFileParseChainIndex(const char *diskTarget,
|
|||||||
*chainIndex = idx;
|
*chainIndex = idx;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
virStringListFree(strings);
|
VIR_FREE(target);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -309,6 +309,11 @@ int virStorageFileParseChainIndex(const char *diskTarget,
|
|||||||
unsigned int *chainIndex)
|
unsigned int *chainIndex)
|
||||||
ATTRIBUTE_NONNULL(3);
|
ATTRIBUTE_NONNULL(3);
|
||||||
|
|
||||||
|
int virStorageFileParseBackingStoreStr(const char *str,
|
||||||
|
char **target,
|
||||||
|
unsigned int *chainIndex)
|
||||||
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
|
||||||
|
|
||||||
virStorageSourcePtr virStorageFileChainLookup(virStorageSourcePtr chain,
|
virStorageSourcePtr virStorageFileChainLookup(virStorageSourcePtr chain,
|
||||||
virStorageSourcePtr startFrom,
|
virStorageSourcePtr startFrom,
|
||||||
const char *name,
|
const char *name,
|
||||||
|
Loading…
Reference in New Issue
Block a user