Re: [PATCH] docs: Better mention of qemu-img amend limitations

[Eric Blake]

On 11/13/20 3:49 AM, Kevin Wolf wrote:
> Am 23.09.2020 um 22:37 hat Eric Blake geschrieben:
>> Missed during merge resolution of commit bc5ee6da71.
>>
>> Signed-off-by: Eric Blake <eblake@redhat.com>
>> ---
>>  docs/tools/qemu-img.rst | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
>> index c35bd6482203..2b5891b54db7 100644
>> --- a/docs/tools/qemu-img.rst
>> +++ b/docs/tools/qemu-img.rst
>> @@ -265,6 +265,10 @@ Command description:
> 
> Adding a little more context:
> 
>>    The set of options that can be amended are dependent on the image
>>    format, but note that amending the backing chain relationship should
>>    instead be performed with ``qemu-img rebase``.
>>
>>    --force allows some unsafe operations. Currently for -f luks, it allows to
>>    erase the last encryption key, and to overwrite an active encryption key.
>>
>> +  The set of options that can be amended are dependent on the image
>> +  format, but note that amending the backing chain relationship should
>> +  instead be performed with ``qemu-img rebase``.
>> +
> 
> I think the problem is your local conflict resolution. This patch would
> duplicate the paragraph.

D'oh.  Thanks for spotting that, patch withdrawn.


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org