From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eric Blake <eblake@redhat.com>, Kevin Wolf <kwolf@redhat.com>,
Maor Lipchuk <mlipchuk@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
Nir Soffer <nsoffer@redhat.com>,
Alberto Garcia <berto@igalia.com>, John Snow <jsnow@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH v7 2/9] raw-format: add bdrv_measure() support
Date: Tue, 13 Jun 2017 14:33:22 +0100 [thread overview]
Message-ID: <20170613133329.23653-3-stefanha@redhat.com> (raw)
In-Reply-To: <20170613133329.23653-1-stefanha@redhat.com>
Maximum size calculation is trivial for the raw format: it's just the
requested image size (because there is no metadata).
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
block/raw-format.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/block/raw-format.c b/block/raw-format.c
index 36e6503..ac7453e 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -312,6 +312,31 @@ static int64_t raw_getlength(BlockDriverState *bs)
return s->size;
}
+static BlockMeasureInfo *raw_measure(QemuOpts *opts, BlockDriverState *in_bs,
+ Error **errp)
+{
+ BlockMeasureInfo *info;
+ int64_t required;
+
+ if (in_bs) {
+ required = bdrv_getlength(in_bs);
+ if (required < 0) {
+ error_setg_errno(errp, -required, "Unable to get image size");
+ return NULL;
+ }
+ } else {
+ required = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),
+ BDRV_SECTOR_SIZE);
+ }
+
+ info = g_new(BlockMeasureInfo, 1);
+ info->required = required;
+
+ /* Unallocated sectors count towards the file size in raw images */
+ info->fully_allocated = info->required;
+ return info;
+}
+
static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
{
return bdrv_get_info(bs->file->bs, bdi);
@@ -479,6 +504,7 @@ BlockDriver bdrv_raw = {
.bdrv_truncate = &raw_truncate,
.bdrv_getlength = &raw_getlength,
.has_variable_length = true,
+ .bdrv_measure = &raw_measure,
.bdrv_get_info = &raw_get_info,
.bdrv_refresh_limits = &raw_refresh_limits,
.bdrv_probe_blocksizes = &raw_probe_blocksizes,
--
2.9.4
next prev parent reply other threads:[~2017-06-13 13:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 13:33 [Qemu-devel] [PATCH v7 0/9] qemu-img: add measure sub-command Stefan Hajnoczi
2017-06-13 13:33 ` [Qemu-devel] [PATCH v7 1/9] block: add bdrv_measure() API Stefan Hajnoczi
2017-06-13 13:33 ` Stefan Hajnoczi [this message]
2017-06-13 13:33 ` [Qemu-devel] [PATCH v7 3/9] qcow2: extract preallocation calculation function Stefan Hajnoczi
2017-06-13 13:33 ` [Qemu-devel] [PATCH v7 4/9] qcow2: make refcount size calculation conservative Stefan Hajnoczi
2017-06-13 13:33 ` [Qemu-devel] [PATCH v7 5/9] qcow2: extract image creation option parsing Stefan Hajnoczi
2017-06-13 13:33 ` [Qemu-devel] [PATCH v7 6/9] qcow2: add bdrv_measure() support Stefan Hajnoczi
2017-06-13 15:07 ` Alberto Garcia
2017-06-14 12:25 ` Stefan Hajnoczi
2017-06-13 13:33 ` [Qemu-devel] [PATCH v7 7/9] qemu-img: add measure subcommand Stefan Hajnoczi
2017-06-13 13:33 ` [Qemu-devel] [PATCH v7 8/9] qemu-iotests: support per-format golden output files Stefan Hajnoczi
2017-06-13 13:33 ` [Qemu-devel] [PATCH v7 9/9] iotests: add test 178 for qemu-img measure Stefan Hajnoczi
2017-06-13 14:24 ` [Qemu-devel] [PATCH v7 0/9] qemu-img: add measure sub-command no-reply
2017-06-14 6:51 ` Fam Zheng
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=20170613133329.23653-3-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).