mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
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:
@@ -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);
|
||||
|
||||
@@ -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)))
|
||||
|
||||
Reference in New Issue
Block a user