From patchwork Thu May 23 08:47:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 245853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 785C22C008A for ; Thu, 23 May 2013 18:53:36 +1000 (EST) Received: from localhost ([::1]:35000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfRHC-0005Af-NE for incoming@patchwork.ozlabs.org; Thu, 23 May 2013 04:53:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfRDw-00017f-Ps for qemu-devel@nongnu.org; Thu, 23 May 2013 04:50:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UfRDv-0002pD-4u for qemu-devel@nongnu.org; Thu, 23 May 2013 04:50:12 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:57098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UfRDu-0002ot-DE for qemu-devel@nongnu.org; Thu, 23 May 2013 04:50:11 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 23 May 2013 18:39:42 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 23 May 2013 18:39:40 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id E79EF2BB0051 for ; Thu, 23 May 2013 18:50:04 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r4N8nvP720119662 for ; Thu, 23 May 2013 18:49:57 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r4N8o4V7011464 for ; Thu, 23 May 2013 18:50:04 +1000 Received: from RH63Wenchao.localdomain ([9.77.176.251]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r4N8lOe1006827; Thu, 23 May 2013 18:50:01 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 23 May 2013 16:47:16 +0800 Message-Id: <1369298836-17416-6-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1369298836-17416-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1369298836-17416-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13052308-0260-0000-0000-0000030B44F1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.140 Cc: kwolf@redhat.com, phrdina@redhat.com, stefanha@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V2 5/5] block: dump to specified output for bdrv_snapshot_dump() and bdrv_image_info_dump() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Buffer is not used now so the string would not be truncated any more. They can be used by both qemu and qemu-img with correct parameter specified. Signed-off-by: Wenchao Xia --- block/qapi.c | 65 +++++++++++++++++++++++++++----------------------- include/block/qapi.h | 5 ++- qemu-img.c | 15 +++++++---- savevm.c | 11 ++++++-- 4 files changed, 55 insertions(+), 41 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 155e77e..2e083f8 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -259,7 +259,7 @@ static char *get_human_readable_size(char *buf, int buf_size, int64_t size) return buf; } -char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) +void bdrv_snapshot_dump(const QemuOutput *output, QEMUSnapshotInfo *sn) { char buf1[128], date_buf[128], clock_buf[128]; struct tm tm; @@ -267,9 +267,9 @@ char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) int64_t secs; if (!sn) { - snprintf(buf, buf_size, - "%-10s%-20s%7s%20s%15s", - "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK"); + message_printf(output, + "%-10s%-20s%7s%20s%15s", + "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK"); } else { ti = sn->date_sec; localtime_r(&ti, &tm); @@ -282,17 +282,17 @@ char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) (int)((secs / 60) % 60), (int)(secs % 60), (int)((sn->vm_clock_nsec / 1000000) % 1000)); - snprintf(buf, buf_size, - "%-10s%-20s%7s%20s%15s", - sn->id_str, sn->name, - get_human_readable_size(buf1, sizeof(buf1), sn->vm_state_size), - date_buf, - clock_buf); + message_printf(output, + "%-10s%-20s%7s%20s%15s", + sn->id_str, sn->name, + get_human_readable_size(buf1, sizeof(buf1), + sn->vm_state_size), + date_buf, + clock_buf); } - return buf; } -void bdrv_image_info_dump(ImageInfo *info) +void bdrv_image_info_dump(const QemuOutput *output, ImageInfo *info) { char size_buf[128], dsize_buf[128]; if (!info->has_actual_size) { @@ -302,43 +302,47 @@ 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); + message_printf(output, + "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"); + message_printf(output, "encrypted: yes\n"); } if (info->has_cluster_size) { - printf("cluster_size: %" PRId64 "\n", info->cluster_size); + message_printf(output, "cluster_size: %" PRId64 "\n", + info->cluster_size); } if (info->has_dirty_flag && info->dirty_flag) { - printf("cleanly shut down: no\n"); + message_printf(output, "cleanly shut down: no\n"); } if (info->has_backing_filename) { - printf("backing file: %s", info->backing_filename); + message_printf(output, "backing file: %s", info->backing_filename); if (info->has_full_backing_filename) { - printf(" (actual path: %s)", info->full_backing_filename); + message_printf(output, " (actual path: %s)", + info->full_backing_filename); } - putchar('\n'); + message_printf(output, "\n"); if (info->has_backing_filename_format) { - printf("backing file format: %s\n", info->backing_filename_format); + message_printf(output, "backing file format: %s\n", + info->backing_filename_format); } } if (info->has_snapshots) { SnapshotInfoList *elem; - char buf[256]; - printf("Snapshot list:\n"); - printf("%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL)); + message_printf(output, "Snapshot list:\n"); + bdrv_snapshot_dump(output, NULL); + message_printf(output, "\n"); /* Ideally bdrv_snapshot_dump() would operate on SnapshotInfoList but * we convert to the block layer's native QEMUSnapshotInfo for now. @@ -354,7 +358,8 @@ 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)); + bdrv_snapshot_dump(output, &sn); + message_printf(output, "\n"); } } } diff --git a/include/block/qapi.h b/include/block/qapi.h index 55d1848..9c80118 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -28,6 +28,7 @@ #include "qapi-types.h" #include "block/block.h" #include "block/snapshot.h" +#include "qemu/error-report.h" void bdrv_collect_snapshots(BlockDriverState *bs , ImageInfo *info); void bdrv_collect_image_info(BlockDriverState *bs, @@ -36,6 +37,6 @@ void bdrv_collect_image_info(BlockDriverState *bs, BlockInfo *bdrv_query_info(BlockDriverState *s); BlockStats *bdrv_query_stats(const BlockDriverState *bs); -char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn); -void bdrv_image_info_dump(ImageInfo *info); +void bdrv_snapshot_dump(const QemuOutput *output, QEMUSnapshotInfo *sn); +void bdrv_image_info_dump(const QemuOutput *output, ImageInfo *info); #endif diff --git a/qemu-img.c b/qemu-img.c index 5d1e480..14901cf 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1554,16 +1554,18 @@ static void dump_snapshots(BlockDriverState *bs) { QEMUSnapshotInfo *sn_tab, *sn; int nb_sns, i; - char buf[256]; + QemuOutput output = {OUTPUT_STREAM, {stdout,} }; nb_sns = bdrv_snapshot_list(bs, &sn_tab); if (nb_sns <= 0) return; - printf("Snapshot list:\n"); - printf("%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL)); + message_printf(&output, "Snapshot list:\n"); + bdrv_snapshot_dump(&output, NULL); + message_printf(&output, "\n"); for(i = 0; i < nb_sns; i++) { sn = &sn_tab[i]; - printf("%s\n", bdrv_snapshot_dump(buf, sizeof(buf), sn)); + bdrv_snapshot_dump(&output, sn); + message_printf(&output, "\n"); } g_free(sn_tab); } @@ -1606,14 +1608,15 @@ static void dump_human_image_info_list(ImageInfoList *list) { ImageInfoList *elem; bool delim = false; + QemuOutput output = {OUTPUT_STREAM, {stdout,} }; for (elem = list; elem; elem = elem->next) { if (delim) { - printf("\n"); + message_printf(&output, "\n"); } delim = true; - bdrv_image_info_dump(elem->value); + bdrv_image_info_dump(&output, elem->value); } } diff --git a/savevm.c b/savevm.c index f988e89..93414e1 100644 --- a/savevm.c +++ b/savevm.c @@ -2540,7 +2540,10 @@ void do_info_snapshots(Monitor *mon, const QDict *qdict) int nb_sns, i, ret, available; int total; int *available_snapshots; - char buf[256]; + QemuOutput output; + + output.kind = OUTPUT_MONITOR; + output.monitor = mon; bs = find_vmstate_bs(); if (!bs) { @@ -2583,10 +2586,12 @@ void do_info_snapshots(Monitor *mon, const QDict *qdict) } if (total > 0) { - monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), NULL)); + bdrv_snapshot_dump(&output, NULL); + monitor_printf(mon, "\n"); for (i = 0; i < total; i++) { sn = &sn_tab[available_snapshots[i]]; - monitor_printf(mon, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), sn)); + bdrv_snapshot_dump(&output, sn); + monitor_printf(mon, "\n"); } } else { monitor_printf(mon, "There is no suitable snapshot available\n");