From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Nir Soffer <nsoffer@redhat.com>, Kevin Wolf <kwolf@redhat.com>,
Maor Lipchuk <mlipchuk@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
Eric Blake <eblake@redhat.com>, Alberto Garcia <berto@igalia.com>,
John Snow <jsnow@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH v6 1/9] block: add bdrv_measure() API
Date: Mon, 8 May 2017 10:15:28 -0400 [thread overview]
Message-ID: <20170508141536.20690-2-stefanha@redhat.com> (raw)
In-Reply-To: <20170508141536.20690-1-stefanha@redhat.com>
bdrv_measure() provides a conservative maximum for the size of a new
image. This information is handy if storage needs to be allocated (e.g.
a SAN or an LVM volume) ahead of time.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
v6:
* Change bdrv_measure() return type to BlockMeasureInfo * [Eric]
* Clarify that holes in sparse POSIX files are still counted [Eric]
---
qapi/block-core.json | 25 +++++++++++++++++++++++++
include/block/block.h | 2 ++
include/block/block_int.h | 2 ++
block.c | 35 +++++++++++++++++++++++++++++++++++
4 files changed, 64 insertions(+)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 87fb747..90795f7 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -463,6 +463,31 @@
'*dirty-bitmaps': ['BlockDirtyInfo'] } }
##
+# @BlockMeasureInfo:
+#
+# Image file size calculation information. This structure describes the size
+# requirements for creating a new image file.
+#
+# The size requirements depend on the new image file format. File size always
+# equals virtual disk size for the 'raw' format, even for sparse POSIX files.
+# Compact formats such as 'qcow2' represent unallocated and zero regions
+# efficiently so file size may be smaller than virtual disk size.
+#
+# The values are upper bounds that are guaranteed to fit the new image file.
+# Subsequent modification, such as internal snapshot or bitmap creation, may
+# require additional space and is not covered here.
+#
+# @required: Size required for a new image file, in bytes.
+#
+# @fully-allocated: Image file size, in bytes, once data has been written
+# to all sectors.
+#
+# Since: 2.10
+##
+{ 'struct': 'BlockMeasureInfo',
+ 'data': {'required': 'int', 'fully-allocated': 'int'} }
+
+##
# @query-block:
#
# Get a list of BlockInfo for all virtual block devices.
diff --git a/include/block/block.h b/include/block/block.h
index 862eb56..4bfd7ae 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -298,6 +298,8 @@ int bdrv_truncate(BdrvChild *child, int64_t offset, Error **errp);
int64_t bdrv_nb_sectors(BlockDriverState *bs);
int64_t bdrv_getlength(BlockDriverState *bs);
int64_t bdrv_get_allocated_file_size(BlockDriverState *bs);
+BlockMeasureInfo *bdrv_measure(BlockDriver *drv, QemuOpts *opts,
+ BlockDriverState *in_bs, Error **errp);
void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr);
void bdrv_refresh_limits(BlockDriverState *bs, Error **errp);
int bdrv_commit(BlockDriverState *bs);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 8773940..9788a69 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -201,6 +201,8 @@ struct BlockDriver {
int64_t (*bdrv_getlength)(BlockDriverState *bs);
bool has_variable_length;
int64_t (*bdrv_get_allocated_file_size)(BlockDriverState *bs);
+ BlockMeasureInfo *(*bdrv_measure)(QemuOpts *opts, BlockDriverState *in_bs,
+ Error **errp);
int coroutine_fn (*bdrv_co_pwritev_compressed)(BlockDriverState *bs,
uint64_t offset, uint64_t bytes, QEMUIOVector *qiov);
diff --git a/block.c b/block.c
index 6c6bb3e..5bc6827 100644
--- a/block.c
+++ b/block.c
@@ -3359,6 +3359,41 @@ int64_t bdrv_get_allocated_file_size(BlockDriverState *bs)
return -ENOTSUP;
}
+/*
+ * bdrv_measure:
+ * @drv: Format driver
+ * @opts: Creation options for new image
+ * @in_bs: Existing image containing data for new image (may be NULL)
+ * @errp: Error object
+ * Returns: A #BlockMeasureInfo (free using qapi_free_BlockMeasureInfo())
+ * or NULL on error
+ *
+ * Calculate file size required to create a new image.
+ *
+ * If @in_bs is given then space for allocated clusters and zero clusters
+ * from that image are included in the calculation. If @opts contains a
+ * backing file that is shared by @in_bs then backing clusters are omitted
+ * from the calculation.
+ *
+ * If @in_bs is NULL then the calculation includes no allocated clusters
+ * unless a preallocation option is given in @opts.
+ *
+ * Note that @in_bs may use a different BlockDriver from @drv.
+ *
+ * If an error occurs the @errp pointer is set.
+ */
+BlockMeasureInfo *bdrv_measure(BlockDriver *drv, QemuOpts *opts,
+ BlockDriverState *in_bs, Error **errp)
+{
+ if (!drv->bdrv_measure) {
+ error_setg(errp, "Block driver '%s' does not support size measurement",
+ drv->format_name);
+ return NULL;
+ }
+
+ return drv->bdrv_measure(opts, in_bs, errp);
+}
+
/**
* Return number of sectors on success, -errno on error.
*/
--
2.9.3
next prev parent reply other threads:[~2017-05-08 14:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-08 14:15 [Qemu-devel] [PATCH v6 0/9] qemu-img: add measure sub-command Stefan Hajnoczi
2017-05-08 14:15 ` Stefan Hajnoczi [this message]
2017-05-08 14:50 ` [Qemu-devel] [PATCH v6 1/9] block: add bdrv_measure() API Eric Blake
2017-05-09 15:28 ` Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 2/9] raw-format: add bdrv_measure() support Stefan Hajnoczi
2017-05-08 14:52 ` Eric Blake
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 3/9] qcow2: extract preallocation calculation function Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 4/9] qcow2: make refcount size calculation conservative Stefan Hajnoczi
2017-05-08 15:00 ` Eric Blake
2017-05-08 19:06 ` Max Reitz
2017-05-08 21:26 ` Max Reitz
2017-05-09 15:32 ` Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 5/9] qcow2: extract image creation option parsing Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 6/9] qcow2: add bdrv_measure() support Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 7/9] qemu-img: add measure subcommand Stefan Hajnoczi
2017-06-12 10:00 ` Alberto Garcia
2017-06-13 9:09 ` Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 8/9] qemu-iotests: support per-format golden output files Stefan Hajnoczi
2017-05-08 14:15 ` [Qemu-devel] [PATCH v6 9/9] iotests: add test 178 for qemu-img measure Stefan Hajnoczi
2017-05-24 12:59 ` [Qemu-devel] [PATCH v6 0/9] qemu-img: add measure sub-command Stefan Hajnoczi
2017-06-12 9:29 ` Stefan Hajnoczi
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=20170508141536.20690-2-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=berrange@redhat.com \
--cc=berto@igalia.com \
--cc=eblake@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mlipchuk@redhat.com \
--cc=nsoffer@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).