On Thu, 2020-05-14 at 14:18 +0200, Max Reitz wrote: > On 10.05.20 15:40, Maxim Levitsky wrote: > > 'force' option will be used for some unsafe amend operations. > > > > This includes things like erasing last keyslot in luks based formats > > (which destroys the data, unless the master key is backed up > > by external means), but that _might_ be desired result. > > > > Signed-off-by: Maxim Levitsky <mlevi...@redhat.com> > > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > > --- > > block.c | 4 +++- > > block/qcow2.c | 1 + > > docs/tools/qemu-img.rst | 5 ++++- > > include/block/block.h | 1 + > > include/block/block_int.h | 1 + > > qemu-img-cmds.hx | 4 ++-- > > qemu-img.c | 8 +++++++- > > 7 files changed, 19 insertions(+), 5 deletions(-) > > [...] > > > diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst > > index 0080f83a76..fc2dca6649 100644 > > --- a/docs/tools/qemu-img.rst > > +++ b/docs/tools/qemu-img.rst > > @@ -249,11 +249,14 @@ Command description: > > > > .. program:: qemu-img-commands > > > > -.. option:: amend [--object OBJECTDEF] [--image-opts] [-p] [-q] [-f FMT] > > [-t CACHE] -o OPTIONS FILENAME > > +.. option:: amend [--object OBJECTDEF] [--image-opts] [-p] [-q] [-f FMT] > > [-t CACHE] [--force] -o OPTIONS FILENAME > > > > Amends the image format specific *OPTIONS* for the image file > > *FILENAME*. Not all file formats support this operation. > > > > + --force allows some unsafe operations. Currently for -f luks, it allows > > to > > + erase last encryption key, and to overwrite an active encryption key. > > *erase the last encryption key Fixed, thanks! > > With that fixed: > > Reviewed-by: Max Reitz <mre...@redhat.com> >
Thanks for the review, Best regards, Maxim Levitsky