From: Hu Tao <hutao@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <famz@redhat.com>,
Stefan Hajnoczi <stefanha@gmail.com>, Peter Lieven <pl@kamp.de>,
Your Name <you@example.com>
Subject: [Qemu-devel] [PATCH v5 1/4] qapi: introduce PreallocMode and a new PreallocMode full.
Date: Tue, 11 Feb 2014 14:57:23 +0800 [thread overview]
Message-ID: <ffd8b3ee42e8fd815cde27afa5d25f173e25f897.1392102200.git.you@example.com> (raw)
In-Reply-To: <cover.1392102200.git.you@example.com>
This patch prepares for the subsequent patches.
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Your Name <you@example.com>
---
block/qcow2.c | 8 ++++----
qapi-schema.json | 12 ++++++++++++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 99a1ad1..30e36bc 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1452,7 +1452,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)
{
@@ -1622,7 +1622,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;
@@ -1643,9 +1643,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 05ced9d..f86068c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4419,3 +4419,15 @@
# 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
+##
+{ 'enum': 'PreallocMode',
+ 'data': [ 'off', 'metadata', 'full' ] }
--
1.8.0
next prev parent reply other threads:[~2014-02-11 6:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-11 6:57 [Qemu-devel] [PATCH v5 0/4] qemu-img: add preallocation=full Hu Tao
2014-02-11 6:57 ` Hu Tao [this message]
2014-02-11 6:57 ` [Qemu-devel] [PATCH v5 2/4] raw, qcow2: don't convert file size to sector size Hu Tao
2014-02-11 7:01 ` Hu Tao
2014-02-11 6:57 ` [Qemu-devel] [PATCH v5 3/4] raw-posix: Add full image preallocation option Hu Tao
2014-02-11 6:57 ` [Qemu-devel] [PATCH v5 4/4] qcow2: " Hu Tao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ffd8b3ee42e8fd815cde27afa5d25f173e25f897.1392102200.git.you@example.com \
--to=hutao@cn.fujitsu.com \
--cc=famz@redhat.com \
--cc=kwolf@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
--cc=you@example.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).