Re: [Qemu-devel] [PATCH v3] qcow2: add overlap check for bitmap directory

[Vladimir Sementsov-Ogievskiy]

05.07.2018 13:46, Kevin Wolf wrote:
> Am 05.07.2018 um 11:21 hat Vladimir Sementsov-Ogievskiy geschrieben:
> > If it appropriate for 3.0, let's push it. If not - then for 3.1
> > with fixed "since". Should I cc stable?
> >
> > v3: - update Qcow2OverlapCheckFlags in qapi/block-core.json [Max]
> >
> > v2: - squash 02 (indentation fix) to 01
> >      - drop comment from qcow2_check_metadata_overlap()
> >      - set @ign to QCOW2_OL_BITMAP_DIRECTORY for in-place case in
> >        bitmap_list_store. I don't think non-inplace case should be changed,
> >        as it don't touch active bitmap directory.
> >
> > Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> > ---
> >   qapi/block-core.json   | 21 ++++++++++++---------
> >   block/qcow2.h          | 45 ++++++++++++++++++++++++---------------------
> >   block/qcow2-bitmap.c   |  7 ++++++-
> >   block/qcow2-refcount.c | 10 ++++++++++
> >   block/qcow2.c          | 22 ++++++++++++++--------
> >   5 files changed, 66 insertions(+), 39 deletions(-)
> >
> > diff --git a/qapi/block-core.json b/qapi/block-core.json
> > index 90e554ed0f..e7393e0313 100644
> > --- a/qapi/block-core.json
> > +++ b/qapi/block-core.json
> > @@ -2695,18 +2695,21 @@
> >   # @template: Specifies a template mode which can be adjusted using the other
> >   #            flags, defaults to 'cached'
> >   #
> > +# @bitmap-directory: since 3.0
> > +#
> >   # Since: 2.9
> >   ##
> >   { 'struct': 'Qcow2OverlapCheckFlags',
> > -  'data': { '*template':       'Qcow2OverlapCheckMode',
> > -            '*main-header':    'bool',
> > -            '*active-l1':      'bool',
> > -            '*active-l2':      'bool',
> > -            '*refcount-table': 'bool',
> > -            '*refcount-block': 'bool',
> > -            '*snapshot-table': 'bool',
> > -            '*inactive-l1':    'bool',
> > -            '*inactive-l2':    'bool' } }
> > +  'data': { '*template':        'Qcow2OverlapCheckMode',
> > +            '*main-header':     'bool',
> > +            '*active-l1':       'bool',
> > +            '*active-l2':       'bool',
> > +            '*refcount-table':  'bool',
> > +            '*refcount-block':  'bool',
> > +            '*snapshot-table':  'bool',
> > +            '*inactive-l1':     'bool',
> > +            '*inactive-l2':     'bool',
> > +            '*bitmap-directory': 'bool' } }
> Did you intend to add two spaces to each line? Because this still isn't
> aligned to the same column.
>
> Kevin

Aha, I forget to add '*', and added it late, after indentation.

--
Best regards,
Vladimir