Skip to content
Commit 3d8b7aed authored by Fam Zheng's avatar Fam Zheng Committed by Michael Roth
Browse files

block: Fix dirty bitmap in bdrv_co_discard



Unsetting dirty globally with discard is not very correct. The discard may zero
out sectors (depending on can_write_zeroes_with_unmap), we should replicate
this change to destination side to make sure that the guest sees the same data.

Calling bdrv_reset_dirty also troubles mirror job because the hbitmap iterator
doesn't expect unsetting of bits after current position.

So let's do it the opposite way which fixes both problems: set the dirty bits
if we are to discard it.

Reported-by: default avatar <wangxiaolong@ucloud.cn>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 50824995)
Conflicts:
	block/io.c

* applied manually to avoid dependency on 61007b31
* squashed in 6e82e4bc bdrv_reset_dirty() is static in
  2.3.0 and becomes unused as of this patch
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 27ed14c4
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment