From patchwork Fri Apr 26 09:31:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 239793 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 2A6732C0112 for ; Fri, 26 Apr 2013 20:01:23 +1000 (EST) Received: from localhost ([::1]:55920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVf5E-0004ml-5I for incoming@patchwork.ozlabs.org; Fri, 26 Apr 2013 05:36:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVf2P-0001mT-Re for qemu-devel@nongnu.org; Fri, 26 Apr 2013 05:33:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVf2O-0007Nv-CC for qemu-devel@nongnu.org; Fri, 26 Apr 2013 05:33:53 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:56378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVf2N-0007NL-HY for qemu-devel@nongnu.org; Fri, 26 Apr 2013 05:33:52 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Apr 2013 19:24:18 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 26 Apr 2013 19:24:16 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id C6A5F2CE804D for ; Fri, 26 Apr 2013 19:33:46 +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 r3Q9Xed522872170 for ; Fri, 26 Apr 2013 19:33:40 +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 r3Q9XjfT007288 for ; Fri, 26 Apr 2013 19:33:46 +1000 Received: from RH63Wenchao ([9.77.181.121]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3Q9VDHi002956; Fri, 26 Apr 2013 19:33:42 +1000 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 26 Apr 2013 17:31:15 +0800 Message-Id: <1366968675-1451-8-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1366968675-1451-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1366968675-1451-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13042609-0260-0000-0000-000002DEEBAA 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 7/7] block: dump to monitor 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 This patch introduce a new print function, which will output message to monitor when it present. With it, bdrv_snapshot_dump() need no more buffer and can avoid string truncation, bdrv_image_info_dump() can also be used by hmp code later, besides qemu-img code. Signed-off-by: Wenchao Xia --- block/qapi.c | 60 ++++++++++++++++++++++-------------------- include/block/qapi.h | 2 +- include/qemu/error-report.h | 1 + qemu-img.c | 7 +++-- savevm.c | 7 +++-- util/qemu-error.c | 18 +++++++++++++ 6 files changed, 59 insertions(+), 36 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 155e77e..15c7656 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -259,7 +259,8 @@ 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) +/* Dump to monitor if it present, otherwise to stdout. */ +void bdrv_snapshot_dump(QEMUSnapshotInfo *sn) { char buf1[128], date_buf[128], clock_buf[128]; struct tm tm; @@ -267,9 +268,8 @@ 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("%-10s%-20s%7s%20s%15s", + "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK"); } else { ti = sn->date_sec; localtime_r(&ti, &tm); @@ -282,16 +282,16 @@ 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("%-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; } +/* Dump to monitor if it present, otherwise to stdout. */ void bdrv_image_info_dump(ImageInfo *info) { char size_buf[128], dsize_buf[128]; @@ -302,43 +302,44 @@ 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("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("encrypted: yes\n"); } if (info->has_cluster_size) { - printf("cluster_size: %" PRId64 "\n", info->cluster_size); + message_printf("cluster_size: %" PRId64 "\n", info->cluster_size); } if (info->has_dirty_flag && info->dirty_flag) { - printf("cleanly shut down: no\n"); + message_printf("cleanly shut down: no\n"); } if (info->has_backing_filename) { - printf("backing file: %s", info->backing_filename); + message_printf("backing file: %s", info->backing_filename); if (info->has_full_backing_filename) { - printf(" (actual path: %s)", info->full_backing_filename); + message_printf(" (actual path: %s)", info->full_backing_filename); } - putchar('\n'); + message_printf("\n"); if (info->has_backing_filename_format) { - printf("backing file format: %s\n", info->backing_filename_format); + message_printf("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("Snapshot list:\n"); + bdrv_snapshot_dump(NULL); + message_printf("\n"); /* Ideally bdrv_snapshot_dump() would operate on SnapshotInfoList but * we convert to the block layer's native QEMUSnapshotInfo for now. @@ -354,7 +355,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(&sn); + message_printf("\n"); } } } diff --git a/include/block/qapi.h b/include/block/qapi.h index 55d1848..d93652d 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -36,6 +36,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_snapshot_dump(QEMUSnapshotInfo *sn); void bdrv_image_info_dump(ImageInfo *info); #endif diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h index c902cc1..90341bd 100644 --- a/include/qemu/error-report.h +++ b/include/qemu/error-report.h @@ -40,4 +40,5 @@ void error_set_progname(const char *argv0); void error_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); const char *error_get_progname(void); +void message_printf(const char *fmt, ...) GCC_FMT_ATTR(1, 2); #endif diff --git a/qemu-img.c b/qemu-img.c index 5d1e480..f732b9a 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1554,16 +1554,17 @@ static void dump_snapshots(BlockDriverState *bs) { QEMUSnapshotInfo *sn_tab, *sn; int nb_sns, i; - char buf[256]; 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)); + bdrv_snapshot_dump(NULL); + printf("\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(sn); + printf("\n"); } g_free(sn_tab); } diff --git a/savevm.c b/savevm.c index ac81c9b..c00ba00 100644 --- a/savevm.c +++ b/savevm.c @@ -2542,7 +2542,6 @@ void do_info_snapshots(Monitor *mon, const QDict *qdict) int nb_sns, i, available; int total; int *available_snapshots; - char buf[256]; bs = find_vmstate_bs(); if (!bs) { @@ -2586,10 +2585,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(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(sn); + monitor_printf(mon, "\n"); } } else { monitor_printf(mon, "There is no suitable snapshot available\n"); diff --git a/util/qemu-error.c b/util/qemu-error.c index 08a36f4..a47bf32 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -213,3 +213,21 @@ void error_report(const char *fmt, ...) va_end(ap); error_printf("\n"); } + +/* + * Print to current monitor if we have one, else to stdout. It is similar with + * error_printf(). + * TODO just like error_vprintf() + */ +void message_printf(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + if (cur_mon) { + monitor_vprintf(cur_mon, fmt, ap); + } else { + vfprintf(stdout, fmt, ap); + } + va_end(ap); +}