On 04/20/2014 04:13 PM, Peter Krempa wrote:
> As a temporary step to allow killing of the "backingStore" field of
> struct virStorageFileMetadata the recursive metadata retrieval function
> will be converted not to use the field in the lookup process.
> ---
> src/util/virstoragefile.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> @@ -1177,10 +1178,12 @@ virStorageFileGetMetadataRecurse(const char *path, const char *canonPath,
> return 0;
> }
> } else {
> - if (VIR_STRDUP(meta->backingStore, meta->backingStoreRaw) < 0)
> + if (VIR_STRDUP(backingPath, meta->backingStoreRaw) < 0)
> return -1;
> }
>
> + if (VIR_STRDUP(meta->backingStore, backingPath) < 0)
> + return -1;
>
> virStorageFileMetadataPtr backing;
Merge conflict with my suggested changes to 4/18, should be easy enough
to fix.
ACK.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list