qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 v5 2/9] raw-format: add bdrv_measure() support
Date: Tue, 18 Apr 2017 14:57:19 +0100	[thread overview]
Message-ID: <20170418135726.28022-3-stefanha@redhat.com> (raw)
In-Reply-To: <20170418135726.28022-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 | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/block/raw-format.c b/block/raw-format.c
index 86fbc65..e66ba00 100644
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -312,6 +312,27 @@ static int64_t raw_getlength(BlockDriverState *bs)
     return s->size;
 }
 
+static void raw_measure(QemuOpts *opts, BlockDriverState *in_bs,
+                        BlockMeasureInfo *info,
+                        Error **errp)
+{
+    if (in_bs) {
+        int64_t ssize = bdrv_getlength(in_bs);
+        if (ssize < 0) {
+            error_setg_errno(errp, -ssize, "Unable to get image size");
+            return;
+        }
+        info->required = ssize;
+    } else {
+        info->required =
+            ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),
+                     BDRV_SECTOR_SIZE);
+    }
+
+    /* Unallocated sectors count towards the file size in raw images */
+    info->fully_allocated = info->required;
+}
+
 static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 {
     return bdrv_get_info(bs->file->bs, bdi);
@@ -477,6 +498,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.3

  parent reply	other threads:[~2017-04-18 13:57 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-18 13:57 [Qemu-devel] [PATCH v5 0/9] qemu-img: add measure sub-command Stefan Hajnoczi
2017-04-18 13:57 ` [Qemu-devel] [PATCH v5 1/9] block: add bdrv_measure() API Stefan Hajnoczi
2017-04-18 15:08   ` Eric Blake
2017-04-19 13:27     ` Stefan Hajnoczi
2017-04-19 13:32       ` Eric Blake
2017-04-20 10:49         ` Stefan Hajnoczi
2017-04-18 13:57 ` Stefan Hajnoczi [this message]
2017-04-18 13:57 ` [Qemu-devel] [PATCH v5 3/9] qcow2: extract preallocation calculation function Stefan Hajnoczi
2017-04-18 13:57 ` [Qemu-devel] [PATCH v5 4/9] qcow2: make refcount size calculation conservative Stefan Hajnoczi
2017-05-08 13:15   ` Alberto Garcia
2017-04-18 13:57 ` [Qemu-devel] [PATCH v5 5/9] qcow2: extract image creation option parsing Stefan Hajnoczi
2017-04-18 13:57 ` [Qemu-devel] [PATCH v5 6/9] qcow2: add bdrv_measure() support Stefan Hajnoczi
2017-05-08 13:16   ` Alberto Garcia
2017-04-18 13:57 ` [Qemu-devel] [PATCH v5 7/9] qemu-img: add measure subcommand Stefan Hajnoczi
2017-05-08 14:17   ` Alberto Garcia
2017-04-18 13:57 ` [Qemu-devel] [PATCH v5 8/9] qemu-iotests: support per-format golden output files Stefan Hajnoczi
2017-05-08 13:18   ` Alberto Garcia
2017-04-18 13:57 ` [Qemu-devel] [PATCH v5 9/9] iotests: add test 178 for qemu-img measure Stefan Hajnoczi
2017-05-08 13:18   ` Alberto Garcia

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=20170418135726.28022-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).