From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRLnA-0005wf-8m for qemu-devel@nongnu.org; Wed, 02 Oct 2013 08:44:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRLn4-0000NO-9h for qemu-devel@nongnu.org; Wed, 02 Oct 2013 08:44:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRLn4-0000NJ-04 for qemu-devel@nongnu.org; Wed, 02 Oct 2013 08:44:30 -0400 Message-ID: <524C1528.5000103@redhat.com> Date: Wed, 02 Oct 2013 14:44:24 +0200 From: Max Reitz MIME-Version: 1.0 References: <1378721861-25552-1-git-send-email-mreitz@redhat.com> <20131002123204.GE12200@stefanha-thinkpad.redhat.com> In-Reply-To: <20131002123204.GE12200@stefanha-thinkpad.redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] block/qcow2: Use bdrv_truncate for size amend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi On 2013-10-02 14:32, Stefan Hajnoczi wrote: > On Mon, Sep 09, 2013 at 12:17:41PM +0200, Max Reitz wrote: >> When amending the size option for a qcow2 image, use bdrv_truncate >> instead of qcow2_truncate directly, since the latter will not adjust the >> total_sectors count in the BDS structure (whereas the former will). >> >> Signed-off-by: Max Reitz >> --- >> Depends on (follow-up to): >> - block/qcow2: Image file option amendment (series, v5) >> --- >> block/qcow2.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/block/qcow2.c b/block/qcow2.c >> index d29547b..259edfd 100644 >> --- a/block/qcow2.c >> +++ b/block/qcow2.c >> @@ -1997,7 +1997,7 @@ static int qcow2_amend_options(BlockDriverState *bs, >> } >> >> if (new_size) { >> - ret = qcow2_truncate(bs, new_size); >> + ret = bdrv_truncate(bs, new_size); >> if (ret < 0) { >> return ret; >> } > It seems this patch was already squashed into > 9296b3ed7050cc6e0645fbc3b0aea74406d7eeb2 ("qcow2: Implement > bdrv_amend_options"). Yes, as Kevin stated in his reply to that series: > Thanks, applied to the block branch with the following changes: > > - Updated patch 5 with > [PATCH] block/qcow2: Use bdrv_truncate for size amend Max