[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v11 4/6] qapi: introduce PreallocMode and a new
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH RFC v11 4/6] qapi: introduce PreallocMode and a new PreallocMode full. |
Date: |
Wed, 2 Jul 2014 16:17:31 +0800 |
This patch prepares for the subsequent patches.
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Hu Tao <address@hidden>
---
block/qcow2.c | 16 ++++++++--------
qapi/block-core.json | 17 +++++++++++++++++
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 05df4b9..cfba93b 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -30,6 +30,7 @@
#include "qemu/error-report.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/qbool.h"
+#include "qapi/util.h"
#include "trace.h"
#include "qemu/option_int.h"
@@ -1594,7 +1595,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,
QemuOpts *opts, int version,
Error **errp)
{
@@ -1771,7 +1772,7 @@ static int qcow2_create(const char *filename, QemuOpts
*opts, Error **errp)
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;
@@ -1787,12 +1788,11 @@ static int qcow2_create(const char *filename, QemuOpts
*opts, Error **errp)
cluster_size = qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE,
DEFAULT_CLUSTER_SIZE);
buf = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
- if (!buf || !strcmp(buf, "off")) {
- prealloc = 0;
- } else if (!strcmp(buf, "metadata")) {
- prealloc = 1;
- } else {
- error_setg(errp, "Invalid preallocation mode: '%s'", buf);
+ prealloc = qapi_enum_parse(PreallocMode_lookup, buf,
+ PREALLOC_MODE_MAX, PREALLOC_MODE_OFF,
+ &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
ret = -EINVAL;
goto finish;
}
diff --git a/qapi/block-core.json b/qapi/block-core.json
index faf394c..ca8a938 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1585,3 +1585,20 @@
'len' : 'int',
'offset': 'int',
'speed' : 'int' } }
+
+# @PreallocMode
+#
+# Preallocation mode of QEMU image file
+#
+# @off: no preallocation
+# @metadata: preallocate only for metadata
+# @falloc: like @full preallocation but allocate disk space by
+# posix_fallocate() rather than writing zeros.
+# @full: preallocate all data by writing zeros to device to ensure disk
+# space is really available. @full preallocation also sets up
+# metadata correctly.
+#
+# Since 2.2
+##
+{ 'enum': 'PreallocMode',
+ 'data': [ 'off', 'metadata', 'falloc', 'full' ] }
--
1.9.3
- [Qemu-devel] [PATCH RFC v11 0/6] qcow2, raw: add preallocation=full and preallocation=falloc, Hu Tao, 2014/07/02
- [Qemu-devel] [PATCH RFC v11 1/6] block: round up file size to nearest sector, Hu Tao, 2014/07/02
- [Qemu-devel] [PATCH RFC v11 2/6] raw, qcow2: don't convert file size to sector size, Hu Tao, 2014/07/02
- [Qemu-devel] [PATCH RFC v11 3/6] rename parse_enum_option to qapi_enum_parse and make it public, Hu Tao, 2014/07/02
- [Qemu-devel] [PATCH RFC v11 4/6] qapi: introduce PreallocMode and a new PreallocMode full.,
Hu Tao <=
- [Qemu-devel] [PATCH RFC v11 5/6] raw-posix: Add falloc and full preallocation option, Hu Tao, 2014/07/02
- [Qemu-devel] [PATCH RFC v11 6/6] qcow2: Add falloc and full preallocation option, Hu Tao, 2014/07/02