From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePA4-0001p2-42 for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZePA0-00015W-PY for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePA0-00015S-Ht for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:12 -0400 From: Paolo Bonzini Date: Tue, 22 Sep 2015 17:05:46 +0200 Message-Id: <1442934371-12567-24-git-send-email-pbonzini@redhat.com> In-Reply-To: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> References: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 23/48] monitor: make monitor_fprintf and mon_get_cpu externally visible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Denis V. Lunev" , =?UTF-8?q?Andreas=20F=C3=83=C2=A4rber?= , Pavel Butsykin From: Pavel Butsykin monitor_fprintf and mon_get_cpu will be used in the target-specific monit= or, so it is advisable to make it external. Signed-off-by: Pavel Butsykin Signed-off-by: Denis V. Lunev CC: Paolo Bonzini CC: Andreas F=C3=83=C2=A4rber Message-Id: <1442927901-1084-6-git-send-email-den@openvz.org> Signed-off-by: Paolo Bonzini --- disas.c | 10 ---------- include/monitor/hmp-target.h | 1 + include/monitor/monitor.h | 1 + monitor.c | 5 ++--- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/disas.c b/disas.c index 0ae70c2..45878fa 100644 --- a/disas.c +++ b/disas.c @@ -392,16 +392,6 @@ monitor_read_memory (bfd_vma memaddr, bfd_byte *myad= dr, int length, return 0; } =20 -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, CPUState *cpu, diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index 611541d..c64f523 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -37,6 +37,7 @@ struct MonitorDef { const MonitorDef *target_monitor_defs(void); =20 CPUArchState *mon_get_cpu_env(void); +CPUState *mon_get_cpu(void); =20 void hmp_info_mem(Monitor *mon, const QDict *qdict); void hmp_info_tlb(Monitor *mon, const QDict *qdict); diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index bc6cb6d..91b95ae 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -34,6 +34,7 @@ int monitor_fd_param(Monitor *mon, const char *fdname, = Error **errp); void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); void monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, = 3); +int monitor_fprintf(FILE *stream, const char *fmt, ...) GCC_FMT_ATTR(2, = 3); void monitor_flush(Monitor *mon); int monitor_set_cpu(int cpu_index); int monitor_get_cpu_index(void); diff --git a/monitor.c b/monitor.c index 476872c..4f1ba2f 100644 --- a/monitor.c +++ b/monitor.c @@ -372,8 +372,7 @@ void monitor_printf(Monitor *mon, const char *fmt, ..= .) va_end(ap); } =20 -static int GCC_FMT_ATTR(2, 3) monitor_fprintf(FILE *stream, - const char *fmt, ...) +int monitor_fprintf(FILE *stream, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -957,7 +956,7 @@ int monitor_set_cpu(int cpu_index) return 0; } =20 -static CPUState *mon_get_cpu(void) +CPUState *mon_get_cpu(void) { if (!cur_mon->mon_cpu) { monitor_set_cpu(0); --=20 2.5.0