On 2018-03-19 09:07, Vladimir Sementsov-Ogievskiy wrote: > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > --- > > If it appropriate for 2.12, let's push it. If not - then for 2.13. > > > 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. > > block/qcow2.h | 45 ++++++++++++++++++++++++--------------------- > block/qcow2-bitmap.c | 7 ++++++- > block/qcow2-refcount.c | 10 ++++++++++ > block/qcow2.c | 22 ++++++++++++++-------- > 4 files changed, 54 insertions(+), 30 deletions(-) > > diff --git a/block/qcow2.h b/block/qcow2.h > index 6f0ff15dd0..896ad08e5b 100644 > --- a/block/qcow2.h > +++ b/block/qcow2.h > @@ -98,6 +98,7 @@ > #define QCOW2_OPT_OVERLAP_SNAPSHOT_TABLE "overlap-check.snapshot-table" > #define QCOW2_OPT_OVERLAP_INACTIVE_L1 "overlap-check.inactive-l1" > #define QCOW2_OPT_OVERLAP_INACTIVE_L2 "overlap-check.inactive-l2" > +#define QCOW2_OPT_OVERLAP_BITMAP_DIRECTORY "overlap-check.bitmap-directory"
In addition to this, Qcow2OverlapCheckFlags in qapi/block-core.json needs to be adjusted. Apart from that, the patch looks good to me. Max > #define QCOW2_OPT_CACHE_SIZE "cache-size" > #define QCOW2_OPT_L2_CACHE_SIZE "l2-cache-size" > #define QCOW2_OPT_REFCOUNT_CACHE_SIZE "refcount-cache-size"
signature.asc
Description: OpenPGP digital signature
