conf: storage: Provide only virStorageVolDefParse

Remove the virStorageVolDefParseFile/String shim functions.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa
2022-09-22 17:22:55 +02:00
parent 3c56186031
commit 2a166e6c12
9 changed files with 16 additions and 41 deletions

View File

@@ -65,11 +65,11 @@ testCompareXMLToArgvFiles(bool shouldFail,
if (inputvolxml)
parse_flags |= VIR_VOL_XML_PARSE_NO_CAPACITY;
if (!(vol = virStorageVolDefParseFile(def, volxml, parse_flags)))
if (!(vol = virStorageVolDefParse(def, NULL, volxml, parse_flags)))
goto cleanup;
if (inputvolxml &&
!(inputvol = virStorageVolDefParseFile(inputpool, inputvolxml, 0)))
!(inputvol = virStorageVolDefParse(inputpool, NULL, inputvolxml, 0)))
goto cleanup;
testSetVolumeType(vol, def);

View File

@@ -22,7 +22,7 @@ testCompareXMLToXMLFiles(const char *poolxml, const char *inxml,
if (!(pool = virStoragePoolDefParse(NULL, poolxml, 0)))
return -1;
if (!(dev = virStorageVolDefParseFile(pool, inxml, flags)))
if (!(dev = virStorageVolDefParse(pool, NULL, inxml, flags)))
return -1;
if (!(actual = virStorageVolDefFormat(pool, dev)))