diff options
| author | Markus Armbruster <armbru@redhat.com> | 2012-06-13 10:11:48 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-06-15 14:03:43 +0200 |
| commit | f8d6bba1c1f56217d9ee71b7aee5f94f46c8f148 (patch) | |
| tree | 55cfcd017b9a4bd29ddd6c79383dbb7f15393c4b /qemu-img.c | |
| parent | f085800e245836fed27fddb3b624a29326637657 (diff) | |
| download | focaccia-qemu-f8d6bba1c1f56217d9ee71b7aee5f94f46c8f148.tar.gz focaccia-qemu-f8d6bba1c1f56217d9ee71b7aee5f94f46c8f148.zip | |
block: Replace bdrv_get_format() by bdrv_get_format_name()
So callers don't need to know anything about maximum name length. Returning a pointer is safe, because the name string lives as long as the block driver it names, and block drivers don't die. Requested by Peter Maydell. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qemu-img.c b/qemu-img.c index 9336c86d9e..80cfb9b167 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1107,7 +1107,7 @@ static int img_info(int argc, char **argv) int c; const char *filename, *fmt; BlockDriverState *bs; - char fmt_name[128], size_buf[128], dsize_buf[128]; + char size_buf[128], dsize_buf[128]; uint64_t total_sectors; int64_t allocated_size; char backing_filename[1024]; @@ -1139,7 +1139,6 @@ static int img_info(int argc, char **argv) if (!bs) { return 1; } - bdrv_get_format(bs, fmt_name, sizeof(fmt_name)); bdrv_get_geometry(bs, &total_sectors); get_human_readable_size(size_buf, sizeof(size_buf), total_sectors * 512); allocated_size = bdrv_get_allocated_file_size(bs); @@ -1153,7 +1152,7 @@ static int img_info(int argc, char **argv) "file format: %s\n" "virtual size: %s (%" PRId64 " bytes)\n" "disk size: %s\n", - filename, fmt_name, size_buf, + filename, bdrv_get_format_name(bs), size_buf, (total_sectors * 512), dsize_buf); if (bdrv_is_encrypted(bs)) { |