From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41547 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCyR2-00012c-2b for qemu-devel@nongnu.org; Fri, 14 May 2010 13:12:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCyR0-00024x-Hf for qemu-devel@nongnu.org; Fri, 14 May 2010 13:12:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64484) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCyR0-00024n-AR for qemu-devel@nongnu.org; Fri, 14 May 2010 13:12:26 -0400 From: Kevin Wolf Date: Fri, 14 May 2010 19:10:44 +0200 Message-Id: <1273857055-26715-11-git-send-email-kwolf@redhat.com> In-Reply-To: <1273857055-26715-1-git-send-email-kwolf@redhat.com> References: <1273857055-26715-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 10/21] block: Fix 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 When reopening the image, don't guess the driver, but use the same driver as was used before. This is important if the format=... option was used for that image. Signed-off-by: Kevin Wolf --- block.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 977d01f..c134c2b 100644 --- a/block.c +++ b/block.c @@ -701,12 +701,12 @@ 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, NULL); + rw_ret = bdrv_open(bs_rw, filename, open_flags | BDRV_O_RDWR, 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, NULL); + ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, drv); if (ret < 0) { bdrv_delete(bs_ro); /* drive not functional anymore */ @@ -758,7 +758,7 @@ 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, NULL); + ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR, drv); if (ret < 0) { bdrv_delete(bs_ro); /* drive not functional anymore */ -- 1.6.6.1