On 04/23/14 18:18, Eric Blake wrote: > On 04/20/2014 04:13 PM, Peter Krempa wrote: >> To avoid having the root of a backing chain present twice in the list we >> need to invert the working of virStorageFileGetMetadataRecurse. >> > >> /* Recursive workhorse for virStorageFileGetMetadata. */ >> static int >> -virStorageFileGetMetadataRecurse(const char *path, const char *canonPath, >> - const char *directory, >> - int format, uid_t uid, gid_t gid, >> - bool allow_probe, virHashTablePtr cycle, >> - virStorageSourcePtr meta) >> +virStorageFileGetMetadataRecurse(virStorageSourcePtr src, >> + const char *canonPath, >> + uid_t uid, gid_t gid, >> + bool allow_probe, >> + virHashTablePtr cycle) >> { > > In actually trying to apply this patch, I hit merge conflicts from my > previous suggested changes. At this point, it would be easier for me if > you can rebase the series, apply the acked patches, and post a v2 of > this one. Okay, I've just pushed patches 1-17 (with 3 and 6 squashed together) and I'll post the rebased version of this one soon. Peter
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list