From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJDEX-0005Dr-92 for qemu-devel@nongnu.org; Thu, 27 Feb 2014 21:31:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJDES-0007bO-NS for qemu-devel@nongnu.org; Thu, 27 Feb 2014 21:31:29 -0500 Received: from [222.73.24.84] (port=60309 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJDES-0007af-5Y for qemu-devel@nongnu.org; Thu, 27 Feb 2014 21:31:24 -0500 From: Hu Tao Date: Fri, 28 Feb 2014 10:29:30 +0800 Message-Id: <3e4f43775bc632868f974f2f27dab942f9a59685.1393554457.git.hutao@cn.fujitsu.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH v6 1/4] 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: Kevin Wolf , Fam Zheng , Peter Lieven , Stefan Hajnoczi 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 0b4335c..d54d289 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1454,7 +1454,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) { @@ -1624,7 +1624,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; @@ -1645,9 +1645,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 7cfb5e5..540d396 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4420,3 +4420,17 @@ # Since: 1.7 ## { 'command': 'blockdev-add', 'data': { 'options': 'BlockdevOptions' } } + +## +# @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' ] } -- 1.8.0