From patchwork Mon Feb 17 13:44:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 321005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0F5072C00CC for ; Tue, 18 Feb 2014 01:23:18 +1100 (EST) Received: from localhost ([::1]:40662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFObo-0001aC-Ug for incoming@patchwork.ozlabs.org; Mon, 17 Feb 2014 08:51:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFOVJ-00014e-UC for qemu-devel@nongnu.org; Mon, 17 Feb 2014 08:45:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFOVB-000174-ET for qemu-devel@nongnu.org; Mon, 17 Feb 2014 08:45:01 -0500 Received: from mail-qc0-x229.google.com ([2607:f8b0:400d:c01::229]:34058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFOVB-00016z-A0 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 08:44:53 -0500 Received: by mail-qc0-f169.google.com with SMTP id w7so23900829qcr.14 for ; Mon, 17 Feb 2014 05:44:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ne6inSVcwBpYq1ecK7j39Jb9iBcb6qZxvBUaLN1PoYY=; b=lQIj5BWpxiCxL7T/momVvpSRfv3CbqnOpEwvqkZXDw1km10hy3EJbhLxvwWBmxJFDs hoymMQZ+oHqgH1ciTB63XLqPGqAyOC0zn94S7L0GhGlO9kvU0yEk1fuGDGe4E7/bjJNM LP6dJnapzv0HF9tO6gEmHSZFIW5ad0Eyd9jgj7pM1STbNutcwu3ZrQnDpWo+raI5EJfM pdGUvkQeW2T/4lZ5C+YDH3Zt3tziZ4La0vprp43MxTxy5QpPHGn9ipFD1G/byOHbmBsm KQmAwQRB9C96XN6J6ub9Yn1jJl2E/8MWoN1OUp4o6pyfAixKsvWaxeRAh9BuhufjJyYm s8oA== X-Received: by 10.224.114.78 with SMTP id d14mr35040544qaq.19.1392644692781; Mon, 17 Feb 2014 05:44:52 -0800 (PST) Received: from yakj.usersys.redhat.com (net-37-117-154-249.cust.vodafonedsl.it. [37.117.154.249]) by mx.google.com with ESMTPSA id p10sm45265803qag.8.2014.02.17.05.44.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Feb 2014 05:44:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Feb 2014 14:44:02 +0100 Message-Id: <1392644647-9897-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392644647-9897-1-git-send-email-pbonzini@redhat.com> References: <1392644647-9897-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::229 Cc: kwolf@redhat.com, jcody@redhat.com, famz@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v3 15/20] vmdk: extract vmdk_read_desc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- block/vmdk.c | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index ff6f5ee..c834512 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -529,6 +529,32 @@ static int vmdk_open_vmfs_sparse(BlockDriverState *bs, static int vmdk_open_desc_file(BlockDriverState *bs, int flags, uint64_t desc_offset, Error **errp); +static char *vmdk_read_desc(BlockDriverState *file, uint64_t desc_offset, + Error **errp) +{ + int64_t size; + char *buf; + int ret; + + size = bdrv_getlength(file); + if (size < 0) { + error_setg_errno(errp, -size, "Could not access file"); + return NULL; + } + + size = MIN(size, 1 << 20); /* avoid unbounded allocation */ + buf = g_malloc0(size + 1); + + ret = bdrv_pread(file, desc_offset, buf, size); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not read from file"); + g_free(buf); + return NULL; + } + + return buf; +} + static int vmdk_open_vmdk4(BlockDriverState *bs, BlockDriverState *file, int flags, Error **errp) @@ -822,23 +848,16 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, uint64_t desc_offset, Error **errp) { int ret; - char *buf = NULL; + char *buf; char ct[128]; BDRVVmdkState *s = bs->opaque; - int64_t size; - size = bdrv_getlength(bs->file); - if (size < 0) { + buf = vmdk_read_desc(bs->file, desc_offset, errp); + if (!buf) { return -EINVAL; - } - - size = MIN(size, 1 << 20); /* avoid unbounded allocation */ - buf = g_malloc0(size + 1); - - ret = bdrv_pread(bs->file, desc_offset, buf, size); - if (ret < 0) { goto exit; } + if (vmdk_parse_description(buf, "createType", ct, sizeof(ct))) { ret = -EMEDIUMTYPE; goto exit;