From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAO6G-0000O1-2c for qemu-devel@nongnu.org; Thu, 24 Jul 2014 14:50:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XAO69-00074D-Hw for qemu-devel@nongnu.org; Thu, 24 Jul 2014 14:50:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53996) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XAO69-00073t-7S for qemu-devel@nongnu.org; Thu, 24 Jul 2014 14:50:37 -0400 Date: Thu, 24 Jul 2014 14:50:34 -0400 From: Jeff Cody Message-ID: <20140724185034.GC24801@localhost.localdomain> References: <1406035177-221890-1-git-send-email-den@openvz.org> <1406035177-221890-4-git-send-email-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1406035177-221890-4-git-send-email-den@openvz.org> Subject: Re: [Qemu-devel] [PATCH 3/4] block/parallels: split check for parallels format in parallels_open List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi On Tue, Jul 22, 2014 at 05:19:36PM +0400, Denis V. Lunev wrote: > and rework error path a bit. There is no difference at the moment, but > the code will be definitely shorter when additional processing will > be required for WithouFreSpacExt > > Signed-off-by: Denis V. Lunev > CC: Kevin Wolf > CC: Stefan Hajnoczi > --- > block/parallels.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/block/parallels.c b/block/parallels.c > index 8f9ec8a..02739cf 100644 > --- a/block/parallels.c > +++ b/block/parallels.c > @@ -85,12 +85,10 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, > goto fail; > } > > - if (memcmp(ph.magic, HEADER_MAGIC, 16) || > - (le32_to_cpu(ph.version) != HEADER_VERSION)) { > - error_setg(errp, "Image not in Parallels format"); > - ret = -EINVAL; > - goto fail; > - } > + if (le32_to_cpu(ph.version) != HEADER_VERSION) > + goto fail_format; > + if (memcmp(ph.magic, HEADER_MAGIC, 16)) > + goto fail_format; QEMU coding style dictates these statements have curly braces, even though they are just one liners. (If you run your patches against scripts/checkpatch.pl, it should catch most style issues). I think this patch could also just be squashed into patch 4, if desired. > > bs->total_sectors = (uint32_t)le64_to_cpu(ph.nb_sectors); > > @@ -120,6 +118,9 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, > qemu_co_mutex_init(&s->lock); > return 0; > > +fail_format: > + error_setg(errp, "Image not in Parallels format"); > + ret = -EINVAL; > fail: > g_free(s->catalog_bitmap); > return ret; > -- > 1.9.1 > >