From f5ca9f1f28064dbb45712ed3df010ac0c8fcc8cc Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: <8a8dc925d6cdb62aba736eb1551195551e09271b.1366117835.git.minovotn@redhat.com> References: <8a8dc925d6cdb62aba736eb1551195551e09271b.1366117835.git.minovotn@redhat.com> From: Kevin Wolf Date: Thu, 7 Mar 2013 15:29:23 +0100 Subject: [PATCH 15/19] block: Replace bdrv_get_format() by bdrv_get_format_name() RH-Author: Kevin Wolf Message-id: <1362670164-15796-12-git-send-email-kwolf@redhat.com> Patchwork-id: 49313 O-Subject: [RHEL-6.5 qemu-kvm PATCH 11/12] block: Replace bdrv_get_format() by bdrv_get_format_name() Bugzilla: 888008 RH-Acked-by: Eric Blake RH-Acked-by: Miroslav Rezanina RH-Acked-by: Stefan Hajnoczi From: Markus Armbruster 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 Signed-off-by: Kevin Wolf (cherry picked from commit f8d6bba1c1f56217d9ee71b7aee5f94f46c8f148) Signed-off-by: Kevin Wolf --- block.c | 11 ++++------- block.h | 2 +- qemu-img.c | 5 ++--- 3 files changed, 7 insertions(+), 11 deletions(-) Signed-off-by: Michal Novotny --- block.c | 11 ++++------- block.h | 2 +- qemu-img.c | 5 ++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/block.c b/block.c index a037192..bbaa077 100644 --- a/block.c +++ b/block.c @@ -1067,7 +1067,8 @@ void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top) * swapping bs_new and bs_top contents. */ tmp.backing_hd = bs_new; pstrcpy(tmp.backing_file, sizeof(tmp.backing_file), bs_top->filename); - bdrv_get_format(bs_top, tmp.backing_format, sizeof(tmp.backing_format)); + pstrcpy(tmp.backing_format, sizeof(tmp.backing_format), + bs_top->drv ? bs_top->drv->format_name : ""); /* swap contents of the fixed new bs and the current top */ *bs_new = *bs_top; @@ -2384,13 +2385,9 @@ int bdrv_set_key(BlockDriverState *bs, const char *key) return ret; } -void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size) +const char *bdrv_get_format_name(BlockDriverState *bs) { - if (!bs->drv) { - buf[0] = '\0'; - } else { - pstrcpy(buf, buf_size, bs->drv->format_name); - } + return bs->drv ? bs->drv->format_name : NULL; } void bdrv_iterate_format(void (*it)(void *opaque, const char *name), diff --git a/block.h b/block.h index 5ac25fc..f60d232 100644 --- a/block.h +++ b/block.h @@ -304,7 +304,7 @@ int bdrv_is_inserted(BlockDriverState *bs); int bdrv_media_changed(BlockDriverState *bs); void bdrv_lock_medium(BlockDriverState *bs, bool locked); void bdrv_eject(BlockDriverState *bs, bool eject_flag); -void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size); +const char *bdrv_get_format_name(BlockDriverState *bs); BlockDriverState *bdrv_find(const char *name); BlockDriverState *bdrv_next(BlockDriverState *bs); void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), diff --git a/qemu-img.c b/qemu-img.c index 5180805..e60b79c 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1129,7 +1129,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]; @@ -1161,7 +1161,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 = get_allocated_file_size(filename); @@ -1175,7 +1174,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)) { -- 1.7.11.7