From patchwork Mon Mar 17 06:53:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 330760 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 CF4182C00CF for ; Mon, 17 Mar 2014 17:56:26 +1100 (EST) Received: from localhost ([::1]:55886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPRTE-0004Xa-Hb for incoming@patchwork.ozlabs.org; Mon, 17 Mar 2014 02:56:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPRSe-0004KP-3J for qemu-devel@nongnu.org; Mon, 17 Mar 2014 02:55:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPRSY-0004nJ-F9 for qemu-devel@nongnu.org; Mon, 17 Mar 2014 02:55:48 -0400 Received: from [222.73.24.84] (port=10053 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPRSY-0004kg-2H for qemu-devel@nongnu.org; Mon, 17 Mar 2014 02:55:42 -0400 X-IronPort-AV: E=Sophos;i="4.97,668,1389715200"; d="scan'208";a="9710152" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 17 Mar 2014 14:51:39 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s2H6tPOX030505; Mon, 17 Mar 2014 14:55:29 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com ([10.167.226.102]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014031714523299-675412 ; Mon, 17 Mar 2014 14:52:32 +0800 From: Hu Tao To: qemu-devel@nongnu.org Date: Mon, 17 Mar 2014 14:53:35 +0800 Message-Id: X-Mailer: git-send-email 1.8.5.2.229.g4448466 In-Reply-To: References: X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/17 14:52:32, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/17 14:52:37, Serialize complete at 2014/03/17 14:52:37 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v7 for 2.0 1/4] qapi: introduce PreallocMode and a new PreallocMode full. 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 This patch prepares for the subsequent patches. Reviewed-by: Fam Zheng Signed-off-by: Hu Tao Reviewed-by: Eric Blake --- block/qcow2.c | 8 ++++---- qapi-schema.json | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 945c9d6..154c40c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1455,7 +1455,7 @@ static int preallocate(BlockDriverState *bs) static int qcow2_create2(const char *filename, int64_t total_size, const char *backing_file, const char *backing_format, - int flags, size_t cluster_size, int prealloc, + int flags, size_t cluster_size, PreallocMode prealloc, QEMUOptionParameter *options, int version, Error **errp) { @@ -1631,7 +1631,7 @@ static int qcow2_create(const char *filename, QEMUOptionParameter *options, uint64_t sectors = 0; int flags = 0; size_t cluster_size = DEFAULT_CLUSTER_SIZE; - int prealloc = 0; + PreallocMode prealloc = PREALLOC_MODE_OFF; int version = 3; Error *local_err = NULL; int ret; @@ -1652,9 +1652,9 @@ static int qcow2_create(const char *filename, QEMUOptionParameter *options, } } else if (!strcmp(options->name, BLOCK_OPT_PREALLOC)) { if (!options->value.s || !strcmp(options->value.s, "off")) { - prealloc = 0; + prealloc = PREALLOC_MODE_OFF; } else if (!strcmp(options->value.s, "metadata")) { - prealloc = 1; + prealloc = PREALLOC_MODE_METADATA; } else { error_setg(errp, "Invalid preallocation mode: '%s'", options->value.s); diff --git a/qapi-schema.json b/qapi-schema.json index b68cd44..e798a5c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4686,3 +4686,17 @@ 'btn' : 'InputBtnEvent', 'rel' : 'InputMoveEvent', 'abs' : 'InputMoveEvent' } } + +## +# @PreallocMode +# +# Preallocation mode of QEMU image file +# +# @off: no preallocation +# @metadata: preallocate only for metadata +# @full: preallocate all data, including metadata +# +# Since 2.0 +## +{ 'enum': 'PreallocMode', + 'data': [ 'off', 'metadata', 'full' ] }