On 2018-07-05 17:15, Vladimir Sementsov-Ogievskiy wrote: > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > --- > > If it appropriate for 3.0, let's push it. If not - then for 3.1 > with fixed "since". Should I cc stable? > > v4: - fix indentation > > 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. > > 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(-)
Thanks, applied to my block branch: https://git.xanclic.moe/XanClic/qemu/commits/branch/block Max
signature.asc
Description: OpenPGP digital signature
