diff options
| author | Markus Armbruster | 2019-04-17 21:17:55 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2019-04-18 22:18:59 +0200 |
| commit | e1ce7d747bc071f86a77683b433b852001163c2c (patch) | |
| tree | b9459e51db7b87862c632ecb47342488bbd9b1a4 /qemu-img.c | |
| parent | qsp: Simplify how qsp_report() prints (diff) | |
| download | qemu-e1ce7d747bc071f86a77683b433b852001163c2c.tar.gz qemu-e1ce7d747bc071f86a77683b433b852001163c2c.tar.xz qemu-e1ce7d747bc071f86a77683b433b852001163c2c.zip | |
block/qapi: Clean up how we print to monitor or stdout
bdrv_snapshot_dump(), bdrv_image_info_specific_dump(),
bdrv_image_info_dump() and their helpers take an fprintf()-like
callback and a FILE * to pass to it.
hmp.c passes monitor_printf() cast to fprintf_function and the current
monitor cast to FILE *.
qemu-img.c and qemu-io-cmds.c pass fprintf and stdout.
The type-punning is technically undefined behaviour, but works in
practice. Clean up: drop the callback, and call qemu_printf()
instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190417191805.28198-8-armbru@redhat.com>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qemu-img.c b/qemu-img.c index c376e91ca0..d7fe546b85 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2483,11 +2483,11 @@ static void dump_snapshots(BlockDriverState *bs) if (nb_sns <= 0) return; printf("Snapshot list:\n"); - bdrv_snapshot_dump(fprintf, stdout, NULL); + bdrv_snapshot_dump(NULL); printf("\n"); for(i = 0; i < nb_sns; i++) { sn = &sn_tab[i]; - bdrv_snapshot_dump(fprintf, stdout, sn); + bdrv_snapshot_dump(sn); printf("\n"); } g_free(sn_tab); @@ -2536,7 +2536,7 @@ static void dump_human_image_info_list(ImageInfoList *list) } delim = true; - bdrv_image_info_dump(fprintf, stdout, elem->value); + bdrv_image_info_dump(elem->value); } } |