From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X9aWY-0001sY-F3 for qemu-devel@nongnu.org; Tue, 22 Jul 2014 09:54:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X9aWS-0003hP-Bg for qemu-devel@nongnu.org; Tue, 22 Jul 2014 09:54:34 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:40242 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X9aWR-0003a9-UA for qemu-devel@nongnu.org; Tue, 22 Jul 2014 09:54:28 -0400 From: "Denis V. Lunev" Date: Tue, 22 Jul 2014 17:19:36 +0400 Message-Id: <1406035177-221890-4-git-send-email-den@openvz.org> In-Reply-To: <1406035177-221890-1-git-send-email-den@openvz.org> References: <1406035177-221890-1-git-send-email-den@openvz.org> Subject: [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: , Cc: Kevin Wolf , den@openvz.org, qemu-devel@nongnu.org, Stefan Hajnoczi 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; 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