[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 23/48] monitor: make monitor_fprintf and mon_get_cpu
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 23/48] monitor: make monitor_fprintf and mon_get_cpu externally visible |
Date: |
Tue, 22 Sep 2015 17:05:46 +0200 |
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>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <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 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);
}
-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;
}
-static CPUState *mon_get_cpu(void)
+CPUState *mon_get_cpu(void)
{
if (!cur_mon->mon_cpu) {
monitor_set_cpu(0);
--
2.5.0
- [Qemu-devel] [PULL 13/48] MAINTAINERS: add IPack section, (continued)
- [Qemu-devel] [PULL 13/48] MAINTAINERS: add IPack section, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 17/48] ioapic: coalesce level interrupts, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 14/48] MAINTAINERS: add more devices to the PC section, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 18/48] ioapic: fix contents of arbitration register, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 19/48] apic_internal.h: make some apic_get_* functions externally visible, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 20/48] apic_internal.h: rename ESR_ILLEGAL_ADDRESS to APIC_ESR_ILLEGAL_ADDRESS, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 21/48] apic_internal.h: added more constants, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 22/48] apic_internal.h: fix formatting and drop unused consts, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 24/48] hmp: added local apic dump state, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 25/48] ioapic_internal.h: added more constants, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 23/48] monitor: make monitor_fprintf and mon_get_cpu externally visible,
Paolo Bonzini <=
- [Qemu-devel] [PULL 26/48] hmp: added io apic dump state, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 28/48] linux_user: elfload: Default ELF_MACHINE to ELF_ARCH, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 29/48] linux-user: elfload: Provide default for elf_check_arch, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 27/48] hmp: implemented io apic dump state for TCG, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 30/48] elf_ops: Fix coding style for EM alias case statement, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 33/48] mb: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 31/48] elf: Update EM_MOXIE definition, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 32/48] arm: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 36/48] moxie: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 37/48] unicore: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22