From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDU2A-00088a-69 for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:10:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDU23-0004cl-Il for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:10:30 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:36826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDU22-0004cK-UO for qemu-devel@nongnu.org; Thu, 07 Mar 2013 01:10:23 -0500 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Mar 2013 11:37:25 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 836FCE004A for ; Thu, 7 Mar 2013 11:41:33 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r276AGuL32112836 for ; Thu, 7 Mar 2013 11:40:16 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r276AHmY032143 for ; Thu, 7 Mar 2013 17:10:18 +1100 From: Wenchao Xia Date: Thu, 7 Mar 2013 14:07:20 +0800 Message-Id: <1362636445-7188-16-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1362636445-7188-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1362636445-7188-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V8 15/20] block: dump to buffer for bdrv_image_info_dump() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, capitulino@redhat.com, stefanha@gmail.com, armbru@redhat.com, pbonzini@redhat.com, Wenchao Xia This allow hmp use this function, just like qemu-img. Signed-off-by: Wenchao Xia --- block/qapi.c | 67 +++++++++++++++++++++++++++++++++++-------------- include/block/qapi.h | 2 +- qemu-img.c | 6 +++- 3 files changed, 54 insertions(+), 21 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index aef1397..f890c1e 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -286,9 +286,30 @@ DeviceImageInfoList *qmp_query_images(bool has_device, return NULL; } -void bdrv_image_info_dump(ImageInfo *info) +GCC_FMT_ATTR(3, 4) +static void snprintf_tail(char **p_buf, int *p_size, const char *fmt, ...) +{ + int l; + if (*p_size < 1) { + return; + } + + va_list ap; + va_start(ap, fmt); + l = vsnprintf(*p_buf, *p_size, fmt, ap); + va_end(ap); + if (l > 0) { + *p_buf += l; + *p_size -= l; + } +} + +/* Use buf instead of asprintf to reduce memory fragility. */ +char *bdrv_image_info_dump(char *buf, int buf_size, ImageInfo *info) { char size_buf[128], dsize_buf[128]; + char *buf1 = buf; + if (!info->has_actual_size) { snprintf(dsize_buf, sizeof(dsize_buf), "unavailable"); } else { @@ -296,43 +317,49 @@ void bdrv_image_info_dump(ImageInfo *info) info->actual_size); } get_human_readable_size(size_buf, sizeof(size_buf), info->virtual_size); - printf("image: %s\n" - "file format: %s\n" - "virtual size: %s (%" PRId64 " bytes)\n" - "disk size: %s\n", - info->filename, info->format, size_buf, - info->virtual_size, - dsize_buf); + snprintf_tail(&buf1, &buf_size, + "image: %s\n" + "file format: %s\n" + "virtual size: %s (%" PRId64 " bytes)\n" + "disk size: %s\n", + info->filename, info->format, size_buf, + info->virtual_size, + dsize_buf); if (info->has_encrypted && info->encrypted) { - printf("encrypted: yes\n"); + snprintf_tail(&buf1, &buf_size, "encrypted: yes\n"); } if (info->has_cluster_size) { - printf("cluster_size: %" PRId64 "\n", info->cluster_size); + snprintf_tail(&buf1, &buf_size, "cluster_size: %" PRId64 "\n", + info->cluster_size); } if (info->has_dirty_flag && info->dirty_flag) { - printf("cleanly shut down: no\n"); + snprintf_tail(&buf1, &buf_size, "cleanly shut down: no\n"); } if (info->has_backing_filename) { - printf("backing file: %s", info->backing_filename); + snprintf_tail(&buf1, &buf_size, "backing file: %s", + info->backing_filename); if (info->has_full_backing_filename) { - printf(" (actual path: %s)", info->full_backing_filename); + snprintf_tail(&buf1, &buf_size, " (actual path: %s)", + info->full_backing_filename); } - putchar('\n'); + snprintf_tail(&buf1, &buf_size, "\n"); if (info->has_backing_filename_format) { - printf("backing file format: %s\n", info->backing_filename_format); + snprintf_tail(&buf1, &buf_size, "backing file format: %s\n", + info->backing_filename_format); } } if (info->has_snapshots) { SnapshotInfoList *elem; - char buf[256]; + char buf_sn[256]; - printf("Snapshot list:\n"); - printf("%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL)); + snprintf_tail(&buf1, &buf_size, "Snapshot list:\n"); + snprintf_tail(&buf1, &buf_size, "%s\n", + bdrv_snapshot_dump(buf_sn, sizeof(buf_sn), NULL)); /* Ideally bdrv_snapshot_dump() would operate on SnapshotInfoList but * we convert to the block layer's native QEMUSnapshotInfo for now. @@ -348,7 +375,9 @@ void bdrv_image_info_dump(ImageInfo *info) pstrcpy(sn.id_str, sizeof(sn.id_str), elem->value->id); pstrcpy(sn.name, sizeof(sn.name), elem->value->name); - printf("%s\n", bdrv_snapshot_dump(buf, sizeof(buf), &sn)); + snprintf_tail(&buf1, &buf_size, "%s\n", + bdrv_snapshot_dump(buf_sn, sizeof(buf_sn), &sn)); } } + return buf; } diff --git a/include/block/qapi.h b/include/block/qapi.h index 76b9e3f..235e6f0 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -11,5 +11,5 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs, int bdrv_query_image_info(BlockDriverState *bs, ImageInfo **p_info, Error **errp); -void bdrv_image_info_dump(ImageInfo *info); +char *bdrv_image_info_dump(char *buf, int buf_size, ImageInfo *info); #endif diff --git a/qemu-img.c b/qemu-img.c index e1d6bac..6db2b38 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1606,10 +1606,12 @@ static void dump_json_image_info(ImageInfo *info) QDECREF(str); } +#define IMAGE_INFO_BUF_SIZE (2048) static void dump_human_image_info_list(ImageInfoList *list) { ImageInfoList *elem; bool delim = false; + char *buf = g_malloc0(IMAGE_INFO_BUF_SIZE); for (elem = list; elem; elem = elem->next) { if (delim) { @@ -1617,8 +1619,10 @@ static void dump_human_image_info_list(ImageInfoList *list) } delim = true; - bdrv_image_info_dump(elem->value); + printf("%s", + bdrv_image_info_dump(buf, IMAGE_INFO_BUF_SIZE, elem->value)); } + g_free(buf); } static gboolean str_equal_func(gconstpointer a, gconstpointer b) -- 1.7.1