On 27.02.2016 10:20, Fam Zheng wrote: > HBitmap is an implementation detail of block dirty bitmap that should be > hidden > from users. Introduce a BdrvDirtyBitmapIter to encapsulate the underlying > HBitmapIter. > > A small difference in the interface is, before, an HBitmapIter is initialized > in place, now the new BdrvDirtyBitmapIter must be dynamically allocated > because > the structure definition is in block.c. > > Two current users are converted too. > > Signed-off-by: Fam Zheng <f...@redhat.com> > Reviewed-by: John Snow <js...@redhat.com> > --- > block/backup.c | 14 ++++++++------ > block/dirty-bitmap.c | 39 +++++++++++++++++++++++++++++++++------ > block/mirror.c | 14 ++++++++------ > include/block/dirty-bitmap.h | 7 +++++-- > include/qemu/typedefs.h | 1 + > 5 files changed, 55 insertions(+), 20 deletions(-)
I tried my best at fixing up the rebase conflicts, but block/mirror.c has just changed too much ("mirror: Rewrite mirror_iteration") to be able to pretend these fixes are trivial. Therefore, I'm afraid this patch will need a rebase. Max
signature.asc
Description: OpenPGP digital signature