From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8ivs-00009B-6k for qemu-devel@nongnu.org; Mon, 03 Sep 2012 22:32:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T8ivq-0003LW-Ok for qemu-devel@nongnu.org; Mon, 03 Sep 2012 22:32:04 -0400 Received: from fnarfbargle.com ([93.93.131.67]:55139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8ivq-0003L7-Ik for qemu-devel@nongnu.org; Mon, 03 Sep 2012 22:32:02 -0400 Message-ID: <50456814.7010301@fnarfbargle.com> Date: Tue, 04 Sep 2012 10:31:48 +0800 From: Brad Campbell MIME-Version: 1.0 References: <1346658419-13829-1-git-send-email-brad@fnarfbargle.com> <5044BD7D.3000706@suse.de> In-Reply-To: <5044BD7D.3000706@suse.de> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [RESEND] [PATCH] Properly use backing file argument to qemu-img convert List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-15?Q?Andreas_F=E4rber?= Cc: kwolf@redhat.com, qemu-devel@nongnu.org On 03/09/12 22:23, Andreas Färber wrote: > Am 03.09.2012 09:46, schrieb Brad Campbell: >> Converting to an image with an output backing file would write out the contents >> of the source image whether or not it was already contained in the new backing >> file. This commit ensures that the source file is checked against the new >> backing file and output is only allocated if it obsoletes or extends data >> already in the supplied backing file. >> >> >> Signed-off-by: Brad Campbell > > For a resend it would've been nice to get the typos out, I'm sure you > mean qemu-img. :) And it would be nice to have that marked as the topic > then so that it's easily recognized ("qemu-img: Bla bla"). To be honest, with a typo that big I would never have picked it up myself no matter how many times I went over it. I'll take that suggestion for the topic, thanks. >> --- >> qemu-img.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++------------- >> 1 files changed, 57 insertions(+), 17 deletions(-) >> >> diff --git a/qemu-img.c b/qemu-img.c >> index c8a70ff..3fb6cbf 100644 >> --- a/qemu-img.c >> +++ b/qemu-img.c >> @@ -629,11 +629,12 @@ static int img_convert(int argc, char **argv) >> int progress = 0, flags; >> const char *fmt, *out_fmt, *cache, *out_baseimg, *out_filename; >> BlockDriver *drv, *proto_drv; >> - BlockDriverState **bs = NULL, *out_bs = NULL; >> + BlockDriverState **bs = NULL, *out_bs = NULL, *out_bf = NULL; >> int64_t total_sectors, nb_sectors, sector_num, bs_offset; >> - uint64_t bs_sectors; >> + uint64_t bf_sectors, bs_sectors; >> uint8_t * buf = NULL; >> const uint8_t *buf1; >> + uint8_t * bf_buf = NULL; > > Should be *bf_buf despite the * buf line above (checkpatch.pl sometimes > mixes up multiplication and declaration of pointer variables). I'll correct and re-send. >> BlockDriverInfo bdi; >> QEMUOptionParameter *param = NULL, *create_options = NULL; >> QEMUOptionParameter *out_baseimg_param; > [snip] > > Note that the merge window for v1.3 is not yet open so you'll have to be > a bit patient before seeing your patch in qemu.git. I'm not in any hurry, it's just that the mail config on the machine I used git send-email from is so broken that the mail to Kevin bounced, so I waited a week before I re-sent it just to avoid bombing the list. As it turns out it's still broken anyway. Thanks for the feedback. Regards, Brad