| Message ID | fd1e46853b2a9cfd44bdc1efa7ffbeeb07e8fc4e.1395035846.git.hutao@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 03/17/2014 12:53 AM, Hu Tao wrote: > This patch prepares for the subsequent patches. > > Reviewed-by: Fam Zheng <famz@redhat.com> > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > --- > block/qcow2.c | 8 ++++---- > qapi-schema.json | 14 ++++++++++++++ > 2 files changed, 18 insertions(+), 4 deletions(-) I'll leave it up to maintainers on whether we are still in time for 2.0 (the feature has been present on list prior to freeze - but at this point it is a feature addition rather than a bug fix), but assuming the answer is yes: Reviewed-by: Eric Blake <eblake@redhat.com>
On Mon, Mar 17, 2014 at 08:58:48AM -0600, Eric Blake wrote: > On 03/17/2014 12:53 AM, Hu Tao wrote: > > This patch prepares for the subsequent patches. > > > > Reviewed-by: Fam Zheng <famz@redhat.com> > > Signed-off-by: Hu Tao <hutao@cn.fujitsu.com> > > --- > > block/qcow2.c | 8 ++++---- > > qapi-schema.json | 14 ++++++++++++++ > > 2 files changed, 18 insertions(+), 4 deletions(-) > > I'll leave it up to maintainers on whether we are still in time for 2.0 > (the feature has been present on list prior to freeze - but at this > point it is a feature addition rather than a bug fix), but assuming the I'm sorry to post the patchset late after freeze. Stefan, can we have any chance to get it merged for 2.0? > answer is yes: > > Reviewed-by: Eric Blake <eblake@redhat.com> > > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org >
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' ] }