From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFOkE-0004T7-C9 for qemu-devel@nongnu.org; Thu, 07 Aug 2014 10:32:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XFOk8-0002qJ-7X for qemu-devel@nongnu.org; Thu, 07 Aug 2014 10:32:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFOk7-0002pY-Ua for qemu-devel@nongnu.org; Thu, 07 Aug 2014 10:32:36 -0400 Date: Thu, 7 Aug 2014 10:32:32 -0400 From: Jeff Cody Message-ID: <20140807143232.GB18633@localhost.localdomain> References: <1406564635-261591-1-git-send-email-den@openvz.org> <1406564635-261591-4-git-send-email-den@openvz.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1406564635-261591-4-git-send-email-den@openvz.org> Subject: Re: [Qemu-devel] [PATCH v2 3/4] 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 Mon, Jul 28, 2014 at 08:23:54PM +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: Jeff Cody > CC: Kevin Wolf > CC: Stefan Hajnoczi > --- > block/parallels.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/block/parallels.c b/block/parallels.c > index 16d14ad..466705e 100644 > --- a/block/parallels.c > +++ b/block/parallels.c > @@ -85,11 +85,11 @@ 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; > } > > bs->total_sectors = 0xffffffff & le64_to_cpu(ph.nb_sectors); > @@ -120,6 +120,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 > > Reviewed-by: Jeff Cody