From patchwork Fri Aug 1 05:27:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 375543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BAFDD140140 for ; Fri, 1 Aug 2014 15:31:27 +1000 (EST) Received: from localhost ([::1]:59904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XD5R7-0004ea-Lu for incoming@patchwork.ozlabs.org; Fri, 01 Aug 2014 01:31:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XD5O6-0007kC-IH for qemu-devel@nongnu.org; Fri, 01 Aug 2014 01:28:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XD5O0-0003bS-Vt for qemu-devel@nongnu.org; Fri, 01 Aug 2014 01:28:18 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:59398 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XD5O0-0003bH-PO for qemu-devel@nongnu.org; Fri, 01 Aug 2014 01:28:12 -0400 Received: from localhost.localdomain (laure.irqsave.net [192.168.77.2]) by paradis.irqsave.net (Postfix) with ESMTP id DC4BCC3137; Fri, 1 Aug 2014 07:28:10 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Fri, 1 Aug 2014 07:27:02 +0200 Message-Id: <1406870842-17988-5-git-send-email-benoit.canet@irqsave.net> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1406870842-17988-1-git-send-email-benoit.canet@irqsave.net> References: <1406870842-17988-1-git-send-email-benoit.canet@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 80.12.84.125 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , Benoit Canet , mreitz@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v1 04/24] monitor: Make monitor_fprintf public before extracting it 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 Signed-off-by: Benoit Canet Reviewed-by: Eric Blake --- disas.c | 10 ---------- include/monitor/monitor.h | 2 ++ monitor.c | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/disas.c b/disas.c index 44a019a..b174f26 100644 --- a/disas.c +++ b/disas.c @@ -435,16 +435,6 @@ monitor_read_memory (bfd_vma memaddr, bfd_byte *myaddr, int length, return 0; } -static int GCC_FMT_ATTR(2, 3) -monitor_fprintf(FILE *stream, const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - monitor_vprintf((Monitor *)stream, fmt, ap); - va_end(ap); - return 0; -} - /* Disassembler for the monitor. See target_disas for a description of flags. */ void monitor_disas(Monitor *mon, CPUArchState *env, diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index bd9a1f2..0155390 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -77,4 +77,6 @@ void add_completion_option(ReadLineState *rs, const char *str, void monitor_user_noop(Monitor *mon, const QObject *data); int do_qmp_capabilities(Monitor *mon, const QDict *params, QObject **ret_data); +int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, const char *fmt, ...); + #endif /* !MONITOR_H */ diff --git a/monitor.c b/monitor.c index 703f5e9..e06f9b5 100644 --- a/monitor.c +++ b/monitor.c @@ -328,8 +328,8 @@ void monitor_printf(Monitor *mon, const char *fmt, ...) va_end(ap); } -static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, - const char *fmt, ...) +int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, + const char *fmt, ...) { va_list ap; va_start(ap, fmt);