[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 4/6] qemu-img: Use bdrv_filename() for map
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 4/6] qemu-img: Use bdrv_filename() for map |
Date: |
Mon, 19 Oct 2015 20:49:04 +0200 |
Replaces bs->filename by the result of bdrv_filename() in the
qemu-img map subcommand. Since that value is queried relatively often,
however, it should be cached.
Signed-off-by: Max Reitz <address@hidden>
---
qemu-img.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/qemu-img.c b/qemu-img.c
index 3025776..a44c77a 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2142,6 +2142,7 @@ typedef struct MapEntry {
int64_t length;
int64_t offset;
BlockDriverState *bs;
+ char *bs_filename;
} MapEntry;
static void dump_map_entry(OutputFormat output_format, MapEntry *e,
@@ -2156,7 +2157,7 @@ static void dump_map_entry(OutputFormat output_format,
MapEntry *e,
}
if ((e->flags & (BDRV_BLOCK_DATA|BDRV_BLOCK_ZERO)) == BDRV_BLOCK_DATA)
{
printf("%#-16"PRIx64"%#-16"PRIx64"%#-16"PRIx64"%s\n",
- e->start, e->length, e->offset, e->bs->filename);
+ e->start, e->length, e->offset, e->bs_filename);
}
/* This format ignores the distinction between 0, ZERO and ZERO|DATA.
* Modify the flags here to allow more coalescing.
@@ -2306,6 +2307,12 @@ static int img_map(int argc, char **argv)
goto out;
}
+ if (next.bs == curr.bs) {
+ next.bs_filename = curr.bs_filename;
+ } else {
+ next.bs_filename = bdrv_filename(next.bs, NULL, 0);
+ }
+
if (curr.length != 0 && curr.flags == next.flags &&
curr.depth == next.depth &&
((curr.flags & BDRV_BLOCK_OFFSET_VALID) == 0 ||
@@ -2317,10 +2324,15 @@ static int img_map(int argc, char **argv)
if (curr.length > 0) {
dump_map_entry(output_format, &curr, &next);
}
+
+ if (curr.bs != next.bs) {
+ g_free(curr.bs_filename);
+ }
curr = next;
}
dump_map_entry(output_format, &curr, NULL);
+ g_free(curr.bs_filename);
out:
blk_unref(blk);
--
2.6.1
- [Qemu-devel] [PATCH v5 0/6] block: Drop BDS.filename, Max Reitz, 2015/10/19
- [Qemu-devel] [PATCH v5 1/6] block: Change bdrv_get_encrypted_filename(), Max Reitz, 2015/10/19
- [Qemu-devel] [PATCH v5 2/6] block: Avoid BlockDriverState.filename, Max Reitz, 2015/10/19
- [Qemu-devel] [PATCH v5 3/6] block: Add bdrv_filename(), Max Reitz, 2015/10/19
- [Qemu-devel] [PATCH v5 4/6] qemu-img: Use bdrv_filename() for map,
Max Reitz <=
- [Qemu-devel] [PATCH v5 6/6] iotests: Test changed Quorum filename, Max Reitz, 2015/10/19
- [Qemu-devel] [PATCH v5 5/6] block: Drop BlockDriverState.filename, Max Reitz, 2015/10/19