From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OA2Wv-0002Bw-1p for qemu-devel@nongnu.org; Thu, 06 May 2010 10:58:25 -0400 Received: from [140.186.70.92] (port=56449 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OA2Wp-00028C-D0 for qemu-devel@nongnu.org; Thu, 06 May 2010 10:58:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OA2Wj-0006oS-Mj for qemu-devel@nongnu.org; Thu, 06 May 2010 10:58:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40584) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OA2Wh-0006nj-NQ for qemu-devel@nongnu.org; Thu, 06 May 2010 10:58:13 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o46Ew9V8009534 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 6 May 2010 10:58:09 -0400 Message-ID: <4BE2D8FD.60603@redhat.com> Date: Thu, 06 May 2010 17:58:05 +0300 From: Naphtali Sprei MIME-Version: 1.0 References: <1273157074-7918-1-git-send-email-kwolf@redhat.com> In-Reply-To: <1273157074-7918-1-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH] block: Fix bdrv_commit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org Kevin Wolf wrote: > 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 adb3e5d..ffe82f8 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 */ Acked-by: Naphtali Sprei