On 04/20/2017 07:00 AM, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > block/dirty-bitmap.c | 74 > +++++++++++++++++++++++++++++++++++++++++--- > block/mirror.c | 11 +++++-- > include/block/block_int.h | 4 +-- > include/block/dirty-bitmap.h | 23 +++++++++++--- > 4 files changed, 97 insertions(+), 15 deletions(-)
Fun conflicts with my pending patches to switch dirty-bitmap to be byte-based instead of sector-based. I doubt the computer will be able to resolve nicely, but I think rebasing by hand should be pretty doable, no matter which of our patches lands first. https://lists.gnu.org/archive/html/qemu-devel/2017-04/msg02163.html -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
