* [Qemu-devel] [PATCH] block: keep bitmap if incremental backup job is cancelled
@ 2015-06-15 15:02 Stefan Hajnoczi
2015-06-16 4:09 ` Jeff Cody
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Hajnoczi @ 2015-06-15 15:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Jeff Cody, qemu-stable, Stefan Hajnoczi
Reclaim the dirty bitmap if an incremental backup block job is
cancelled. The ret variable may be 0 when the job is cancelled so it's
not enough to check ret < 0.
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/backup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/backup.c b/block/backup.c
index d3f648d..c1ad975 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -430,7 +430,7 @@ static void coroutine_fn backup_run(void *opaque)
if (job->sync_bitmap) {
BdrvDirtyBitmap *bm;
- if (ret < 0) {
+ if (ret < 0 || block_job_is_cancelled(&job->common)) {
/* Merge the successor back into the parent, delete nothing. */
bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
assert(bm);
--
2.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] block: keep bitmap if incremental backup job is cancelled
2015-06-15 15:02 [Qemu-devel] [PATCH] block: keep bitmap if incremental backup job is cancelled Stefan Hajnoczi
@ 2015-06-16 4:09 ` Jeff Cody
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Cody @ 2015-06-16 4:09 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, qemu-stable
On Mon, Jun 15, 2015 at 04:02:14PM +0100, Stefan Hajnoczi wrote:
> Reclaim the dirty bitmap if an incremental backup block job is
> cancelled. The ret variable may be 0 when the job is cancelled so it's
> not enough to check ret < 0.
>
> Reviewed-by: John Snow <jsnow@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> block/backup.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/backup.c b/block/backup.c
> index d3f648d..c1ad975 100644
> --- a/block/backup.c
> +++ b/block/backup.c
> @@ -430,7 +430,7 @@ static void coroutine_fn backup_run(void *opaque)
>
> if (job->sync_bitmap) {
> BdrvDirtyBitmap *bm;
> - if (ret < 0) {
> + if (ret < 0 || block_job_is_cancelled(&job->common)) {
> /* Merge the successor back into the parent, delete nothing. */
> bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
> assert(bm);
> --
> 2.4.3
>
Thanks, applied to my block tree:
https://github.com/codyprime/qemu-kvm-jtc/commits/block
Jeff
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-16 4:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-15 15:02 [Qemu-devel] [PATCH] block: keep bitmap if incremental backup job is cancelled Stefan Hajnoczi
2015-06-16 4:09 ` Jeff Cody
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).