From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pl@kamp.de, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH 12/17] qemu-img: add a "map" subcommand
Date: Wed, 3 Jul 2013 16:34:26 +0200 [thread overview]
Message-ID: <1372862071-28225-13-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1372862071-28225-1-git-send-email-pbonzini@redhat.com>
This command dumps the metadata of an entire chain, in either tabular or JSON
format.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qemu-img-cmds.hx | 6 ++
qemu-img.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 192 insertions(+)
diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
index 4ca7e95..acc3a1c 100644
--- a/qemu-img-cmds.hx
+++ b/qemu-img-cmds.hx
@@ -45,6 +45,12 @@ STEXI
@item info [-f @var{fmt}] [--output=@var{ofmt}] [--backing-chain] @var{filename}
ETEXI
+DEF("map", img_map,
+ "map [-f fmt] [--output=ofmt] filename")
+STEXI
+@item map [-f @var{fmt}] [--output=@var{ofmt}] filename
+ETEXI
+
DEF("snapshot", img_snapshot,
"snapshot [-q] [-l | -a snapshot | -c snapshot | -d snapshot] filename")
STEXI
diff --git a/qemu-img.c b/qemu-img.c
index 6461932..97392a5 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1768,6 +1768,192 @@ static int img_info(int argc, char **argv)
return 0;
}
+
+typedef struct MapEntry {
+ int flags;
+ int depth;
+ int64_t start;
+ int64_t length;
+ int64_t offset;
+} MapEntry;
+
+static void dump_map_entry(OutputFormat output_format, MapEntry *e,
+ MapEntry *next)
+{
+ switch (output_format) {
+ case OFORMAT_HUMAN:
+ if ((e->flags & (BDRV_BLOCK_DATA|BDRV_BLOCK_ZERO)) == BDRV_BLOCK_DATA) {
+ printf("%lld %lld %d %lld\n",
+ (long long) e->start, (long long) e->length,
+ e->depth, (long long) e->offset);
+ }
+ /* This format ignores the distinction between 0, ZERO and ZERO|DATA.
+ * Modify the flags here to allow more coalescing.
+ */
+ if (next &&
+ (next->flags & (BDRV_BLOCK_DATA|BDRV_BLOCK_ZERO)) != BDRV_BLOCK_DATA) {
+ next->flags &= ~BDRV_BLOCK_DATA;
+ next->flags |= BDRV_BLOCK_ZERO;
+ }
+ break;
+ case OFORMAT_JSON:
+ printf("%s{ 'depth': %d, 'start': %lld, 'length': %lld, "
+ "'zero': %s, 'data': %s",
+ (e->start == 0 ? "[" : ",\n"),
+ e->depth, (long long) e->start, (long long) e->length,
+ (e->flags & BDRV_BLOCK_ZERO) ? "true" : "false",
+ (e->flags & BDRV_BLOCK_DATA) ? "true" : "false");
+ if (e->flags & BDRV_BLOCK_OFFSET_VALID) {
+ printf(", 'offset': %lld", (long long) e->offset);
+ }
+ putchar('}');
+
+ if (!next) {
+ printf("]\n");
+ }
+ break;
+ }
+}
+
+static int64_t get_block_status(BlockDriverState *bs, int64_t sector_num,
+ int *nb_sectors, int *depth)
+{
+ int64_t ret;
+
+ /* As an optimization, we could cache the current range of unallocated
+ * clusters in each file of the chain, and avoid querying the same
+ * range repeatedly.
+ */
+
+ *depth = 0;
+ for (;;) {
+ int orig_nb_sectors = *nb_sectors;
+
+ if (bs == NULL) {
+ return 0;
+ }
+ ret = bdrv_get_block_status(bs, sector_num, *nb_sectors, nb_sectors);
+ if (ret < 0) {
+ return ret;
+ }
+
+ if (ret & (BDRV_BLOCK_ZERO|BDRV_BLOCK_DATA)) {
+ return ret;
+ }
+ if (!*nb_sectors) {
+ /* Beyond the end of this image (while presumably within the
+ * range of the BlockDriverState above this one). The extra
+ * data is read as zeroes.
+ */
+ *nb_sectors = orig_nb_sectors;
+ return BDRV_BLOCK_ZERO;
+ }
+
+ bs = bs->backing_hd;
+ (*depth)++;
+ }
+}
+
+static int img_map(int argc, char **argv)
+{
+ int c;
+ OutputFormat output_format = OFORMAT_HUMAN;
+ BlockDriverState *bs;
+ const char *filename, *fmt, *output;
+ int64_t length;
+ MapEntry curr = { .length = 0 }, next;
+
+ fmt = NULL;
+ output = NULL;
+ for(;;) {
+ int option_index = 0;
+ static const struct option long_options[] = {
+ {"help", no_argument, 0, 'h'},
+ {"format", required_argument, 0, 'f'},
+ {"output", required_argument, 0, OPTION_OUTPUT},
+ {0, 0, 0, 0}
+ };
+ c = getopt_long(argc, argv, "f:h",
+ long_options, &option_index);
+ if (c == -1) {
+ break;
+ }
+ switch(c) {
+ case '?':
+ case 'h':
+ help();
+ break;
+ case 'f':
+ fmt = optarg;
+ break;
+ case OPTION_OUTPUT:
+ output = optarg;
+ break;
+ }
+ }
+ if (optind >= argc) {
+ help();
+ }
+ filename = argv[optind++];
+
+ if (output && !strcmp(output, "json")) {
+ output_format = OFORMAT_JSON;
+ } else if (output && !strcmp(output, "human")) {
+ output_format = OFORMAT_HUMAN;
+ } else if (output) {
+ error_report("--output must be used with human or json as argument.");
+ return 1;
+ }
+
+ bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS, true, false);
+ if (!bs) {
+ return 1;
+ }
+
+ length = bdrv_getlength(bs);
+ while (curr.start + curr.length < length) {
+ int64_t nsectors_left, ret;
+ int64_t sector_num;
+ int n, depth, flags;
+
+ /* Probe up to 1 G at a time. */
+ sector_num = (curr.start + curr.length) >> BDRV_SECTOR_BITS;
+ nsectors_left = DIV_ROUND_UP(length, BDRV_SECTOR_SIZE) - sector_num;
+ n = MAX(1 << (30 - BDRV_SECTOR_BITS), nsectors_left);
+ ret = get_block_status(bs, sector_num, &n, &depth);
+
+ if (ret < 0) {
+ error_report("Could not read file metadata: %s", strerror(-ret));
+ return 1;
+ }
+ if ((ret & BDRV_BLOCK_DATA) &&
+ !(ret & BDRV_BLOCK_OFFSET_VALID)) {
+ error_report("File contains external or compressed clusters.");
+ return 1;
+ }
+
+ flags = ret & ~BDRV_BLOCK_OFFSET_MASK;
+ ret &= BDRV_BLOCK_OFFSET_MASK;
+ if (curr.length == 0 || curr.flags != flags || curr.depth != depth ||
+ ((curr.flags & BDRV_BLOCK_OFFSET_VALID) &&
+ curr.offset + curr.length != ret)) {
+ next.flags = flags;
+ next.depth = depth;
+ next.start = sector_num << BDRV_SECTOR_BITS;
+ next.offset = ret;
+ next.length = 0;
+ if (curr.length > 0) {
+ dump_map_entry(output_format, &curr, &next);
+ }
+ curr = next;
+ }
+ curr.length += n << BDRV_SECTOR_BITS;
+ }
+
+ dump_map_entry(output_format, &curr, NULL);
+ return 0;
+}
+
#define SNAPSHOT_LIST 1
#define SNAPSHOT_CREATE 2
#define SNAPSHOT_APPLY 3
--
1.8.2.1
next prev parent reply other threads:[~2013-07-03 14:35 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 14:34 [Qemu-devel] [PATCH 00/17] Add qemu-img subcommand to dump file metadata Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 01/17] cow: make reads go at a decent speed Paolo Bonzini
2013-07-04 2:20 ` Fam Zheng
2013-07-04 8:08 ` Paolo Bonzini
2013-07-05 9:09 ` Stefan Hajnoczi
2013-07-03 14:34 ` [Qemu-devel] [PATCH 02/17] cow: make writes go at a less indecent speed Paolo Bonzini
2013-07-04 2:40 ` Fam Zheng
2013-07-04 8:11 ` Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 03/17] cow: do not call bdrv_co_is_allocated Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 04/17] block: make bdrv_co_is_allocated static Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 05/17] block: remove bdrv_is_allocated_above/bdrv_co_is_allocated_above distinction Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 06/17] block: expect errors from bdrv_co_is_allocated Paolo Bonzini
2013-07-05 9:19 ` Stefan Hajnoczi
2013-07-05 10:28 ` Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 07/17] qemu-img: always probe the input image for allocated sectors Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 08/17] block: make bdrv_has_zero_init return false for copy-on-write-images Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 09/17] block: introduce bdrv_get_block_status API Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 10/17] block: define get_block_status return value Paolo Bonzini
2013-07-03 21:04 ` Peter Lieven
2013-07-04 8:13 ` Paolo Bonzini
2013-07-04 21:10 ` Peter Lieven
2013-07-05 0:49 ` Fam Zheng
2013-07-03 14:34 ` [Qemu-devel] [PATCH 11/17] block: return get_block_status data and flags for formats Paolo Bonzini
2013-07-04 3:22 ` Fam Zheng
2013-07-04 8:14 ` Paolo Bonzini
2013-07-03 14:34 ` Paolo Bonzini [this message]
2013-07-04 5:34 ` [Qemu-devel] [PATCH 12/17] qemu-img: add a "map" subcommand Fam Zheng
2013-07-04 8:16 ` Paolo Bonzini
2013-07-04 8:36 ` Fam Zheng
2013-07-16 3:31 ` Stefan Hajnoczi
2013-07-16 6:26 ` Paolo Bonzini
2013-07-18 20:04 ` Eric Blake
2013-07-19 4:48 ` Stefan Hajnoczi
2013-07-19 5:54 ` Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 13/17] block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 14/17] raw-posix: return get_block_status data and flags Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 15/17] raw-posix: detect XFS unwritten extents Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 16/17] block: add default get_block_status implementation for protocols Paolo Bonzini
2013-07-16 6:47 ` Peter Lieven
2013-07-16 7:19 ` Paolo Bonzini
2013-07-16 7:54 ` Peter Lieven
2013-07-16 9:37 ` Paolo Bonzini
2013-07-17 10:26 ` Peter Lieven
2013-07-17 10:33 ` Paolo Bonzini
2013-07-03 14:34 ` [Qemu-devel] [PATCH 17/17] block: look for zero blocks in bs->file Paolo Bonzini
2013-07-16 3:41 ` [Qemu-devel] [PATCH 00/17] Add qemu-img subcommand to dump file metadata Stefan Hajnoczi
2013-07-16 6:49 ` Peter Lieven
2013-07-18 3:54 ` 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=1372862071-28225-13-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=kwolf@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).