From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wuw7z-0006xZ-5L for qemu-devel@nongnu.org; Wed, 11 Jun 2014 23:56:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wuw7t-0004Kg-MW for qemu-devel@nongnu.org; Wed, 11 Jun 2014 23:56:39 -0400 Received: from [59.151.112.132] (port=10379 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wuw7r-0004Jo-LQ for qemu-devel@nongnu.org; Wed, 11 Jun 2014 23:56:33 -0400 From: Hu Tao Date: Thu, 12 Jun 2014 11:54:25 +0800 Message-ID: <326b6e2708ff8cf314fa0fe29aeeb1f7f674122d.1402544518.git.hutao@cn.fujitsu.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v10 4/6] qapi: introduce PreallocMode and a new PreallocMode full. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Peter Lieven , Markus Armbruster , Max Reitz , Stefan Hajnoczi , y-goto@jp.fujitsu.com This patch prepares for the subsequent patches. Reviewed-by: Fam Zheng Reviewed-by: Eric Blake Signed-off-by: Hu Tao --- 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 6732e7c..2e0b83c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1593,7 +1593,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) { @@ -1770,7 +1770,7 @@ static int qcow2_create(const char *filename, QEMUOptionParameter *options, uint64_t size = 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; @@ -1791,9 +1791,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 14b498b..f5ccb31 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3077,3 +3077,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.1 +## +{ 'enum': 'PreallocMode', + 'data': [ 'off', 'metadata', 'full' ] } -- 1.9.3