[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/9] monitor: make monitor_fprintf and mon_get_cpu e
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 5/9] monitor: make monitor_fprintf and mon_get_cpu externally visible |
Date: |
Mon, 21 Sep 2015 13:57:33 +0300 |
From: Pavel Butsykin <address@hidden>
monitor_fprintf and mon_get_cpu will be used in the target-specific monitor,
so it is advisable to make it external.
Signed-off-by: Pavel Butsykin <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Andreas Färber <address@hidden>
---
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 *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, 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);
CPUArchState *mon_get_cpu_env(void);
+CPUState *mon_get_cpu(void);
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 9aff47e..f95a384 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 1f43263..d303579 100644
--- a/monitor.c
+++ b/monitor.c
@@ -371,8 +371,7 @@ 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 monitor_fprintf(FILE *stream, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
@@ -941,7 +940,7 @@ int monitor_set_cpu(int cpu_index)
return 0;
}
-static CPUState *mon_get_cpu(void)
+CPUState *mon_get_cpu(void)
{
if (!cur_mon->mon_cpu) {
monitor_set_cpu(0);
--
2.1.4
- [Qemu-devel] [PATCH v3 0/9] hmp command IO- and Local APIC dump state, Denis V. Lunev, 2015/09/21
- [Qemu-devel] [PATCH 3/9] apic_internal.h: added more constants, Denis V. Lunev, 2015/09/21
- [Qemu-devel] [PATCH 5/9] monitor: make monitor_fprintf and mon_get_cpu externally visible,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 2/9] apic_internal.h: rename ESR_ILLEGAL_ADDRESS to APIC_ESR_ILLEGAL_ADDRESS, Denis V. Lunev, 2015/09/21
- [Qemu-devel] [PATCH 1/9] apic_internal.h: make some apic_get_* functions externally visible, Denis V. Lunev, 2015/09/21
- [Qemu-devel] [PATCH 4/9] apic_internal.h: fix formatting and drop unused consts, Denis V. Lunev, 2015/09/21
- [Qemu-devel] [PATCH 7/9] ioapic_internal.h: added more constants, Denis V. Lunev, 2015/09/21
- [Qemu-devel] [PATCH 6/9] hmp: added local apic dump state, Denis V. Lunev, 2015/09/21
- [Qemu-devel] [PATCH 8/9] hmp: added io apic dump state, Denis V. Lunev, 2015/09/21
- [Qemu-devel] [PATCH 9/9] hmp: implemented io apic dump state for TCG, Denis V. Lunev, 2015/09/21
- Re: [Qemu-devel] [PATCH v3 0/9] hmp command IO- and Local APIC dump state, Paolo Bonzini, 2015/09/21