qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, mreitz@redhat.com, jcody@redhat.com,
	famz@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 04/10] mirror: Fix error path for dirty bitmap creation
Date: Mon,  6 Mar 2017 17:21:56 +0100	[thread overview]
Message-ID: <1488817322-11397-5-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1488817322-11397-1-git-send-email-kwolf@redhat.com>

mirror_top_bs must be removed from the graph again when creating the
dirty bitmap fails.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/mirror.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/block/mirror.c b/block/mirror.c
index 001b5f0..f24dc51 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1197,10 +1197,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
 
     s->dirty_bitmap = bdrv_create_dirty_bitmap(bs, granularity, NULL, errp);
     if (!s->dirty_bitmap) {
-        g_free(s->replaces);
-        blk_unref(s->target);
-        block_job_unref(&s->common);
-        return;
+        goto fail;
     }
 
     /* Required permissions are already taken with blk_new() */
-- 
1.8.3.1

  parent reply	other threads:[~2017-03-06 16:22 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-06 16:21 [Qemu-devel] [PATCH 00/10] block: Op blocker fixes Kevin Wolf
2017-03-06 16:21 ` [Qemu-devel] [PATCH 01/10] commit: Fix error handling Kevin Wolf
2017-03-06 16:44   ` Philippe Mathieu-Daudé
2017-03-06 16:21 ` [Qemu-devel] [PATCH 02/10] mirror: Fix permission problem with 'replaces' Kevin Wolf
2017-03-06 20:01   ` Eric Blake
2017-03-06 16:21 ` [Qemu-devel] [PATCH 03/10] mirror: Fix permissions for removing mirror_top_bs Kevin Wolf
2017-03-06 20:13   ` Eric Blake
2017-03-06 16:21 ` Kevin Wolf [this message]
2017-03-06 20:15   ` [Qemu-devel] [PATCH 04/10] mirror: Fix error path for dirty bitmap creation Eric Blake
2017-03-06 16:21 ` [Qemu-devel] [PATCH 05/10] block: Fix blockdev-snapshot error handling Kevin Wolf
2017-03-06 20:23   ` Eric Blake
2017-03-07 12:32     ` Kevin Wolf
2017-03-06 16:21 ` [Qemu-devel] [PATCH 06/10] block: Factor out should_update_child() Kevin Wolf
2017-03-06 20:35   ` Eric Blake
2017-03-07  0:00     ` Philippe Mathieu-Daudé
2017-03-06 16:21 ` [Qemu-devel] [PATCH 07/10] block: Factor out bdrv_replace_child_noperm() Kevin Wolf
2017-03-06 20:36   ` Eric Blake
2017-03-06 16:22 ` [Qemu-devel] [PATCH 08/10] block: Ignore multiple children in bdrv_check_update_perm() Kevin Wolf
2017-03-06 21:07   ` Eric Blake
2017-03-06 16:22 ` [Qemu-devel] [PATCH 09/10] block: Handle permission errors in change_parent_backing_link() Kevin Wolf
2017-03-06 21:19   ` Eric Blake
2017-03-06 16:22 ` [Qemu-devel] [PATCH 10/10] block: Fix error handling in bdrv_replace_in_backing_chain() Kevin Wolf
2017-03-06 21:22   ` Eric Blake
2017-03-07  9:06 ` [Qemu-devel] [PATCH 00/10] block: Op blocker fixes Fam Zheng
2017-03-07 12:36 ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1488817322-11397-5-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=famz@redhat.com \
    --cc=jcody@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).