From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33814 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq7cG-0001Ra-9y for qemu-devel@nongnu.org; Mon, 30 Aug 2010 12:53:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oq7cD-00019d-9A for qemu-devel@nongnu.org; Mon, 30 Aug 2010 12:53:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13835) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oq7cD-00019R-2k for qemu-devel@nongnu.org; Mon, 30 Aug 2010 12:53:49 -0400 From: Kevin Wolf Date: Mon, 30 Aug 2010 18:53:50 +0200 Message-Id: <1283187233-3925-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1283187233-3925-1-git-send-email-kwolf@redhat.com> References: <1283187233-3925-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE 0.13][PATCH 3/6] block: Fix image re-open in bdrv_commit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org Arguably we should re-open the backing file with the backing file format and not with the format of the snapshot image. Signed-off-by: Kevin Wolf (cherry picked from commit ee1811965fd15e0b41f8d508b951a8ab826ae3a7) Conflicts: block.c Signed-off-by: Kevin Wolf --- block.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 8014a5c..e6087f3 100644 --- a/block.c +++ b/block.c @@ -743,6 +743,7 @@ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res) int bdrv_commit(BlockDriverState *bs) { BlockDriver *drv = bs->drv; + BlockDriver *backing_drv; int64_t i, total_sectors; int n, j, ro, open_flags; int ret = 0, rw_ret = 0; @@ -760,7 +761,8 @@ int bdrv_commit(BlockDriverState *bs) if (bs->backing_hd->keep_read_only) { return -EACCES; } - + + backing_drv = bs->backing_hd->drv; ro = bs->backing_hd->read_only; strncpy(filename, bs->backing_hd->filename, sizeof(filename)); open_flags = bs->backing_hd->open_flags; @@ -770,12 +772,14 @@ int bdrv_commit(BlockDriverState *bs) bdrv_delete(bs->backing_hd); bs->backing_hd = NULL; bs_rw = bdrv_new(""); - rw_ret = bdrv_open(bs_rw, filename, open_flags | BDRV_O_RDWR, drv); + rw_ret = bdrv_open(bs_rw, filename, open_flags | BDRV_O_RDWR, + backing_drv); if (rw_ret < 0) { bdrv_delete(bs_rw); /* try to re-open read-only */ bs_ro = bdrv_new(""); - ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, drv); + ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, + backing_drv); if (ret < 0) { bdrv_delete(bs_ro); /* drive not functional anymore */ @@ -827,7 +831,8 @@ ro_cleanup: bdrv_delete(bs->backing_hd); bs->backing_hd = NULL; bs_ro = bdrv_new(""); - ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, drv); + ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, + backing_drv); if (ret < 0) { bdrv_delete(bs_ro); /* drive not functional anymore */ -- 1.7.2.2