90c84c5600
CPUClass method dump_statistics() takes an fprintf()-like callback and a FILE * to pass to it. Most callers pass fprintf() and stderr. log_cpu_state() passes fprintf() and qemu_log_file. hmp_info_registers() passes monitor_fprintf() and the current monitor cast to FILE *. monitor_fprintf() casts it right back, and is otherwise identical to monitor_printf(). The callback gets passed around a lot, which is tiresome. The type-punning around monitor_fprintf() is ugly. Drop the callback, and call qemu_fprintf() instead. Also gets rid of the type-punning, since qemu_fprintf() takes NULL instead of the current monitor cast to FILE *. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <20190417191805.28198-15-armbru@redhat.com>
61 lines
1.3 KiB
C
61 lines
1.3 KiB
C
#ifndef QEMU_EXEC_LOG_H
|
|
#define QEMU_EXEC_LOG_H
|
|
|
|
#include "qemu/log.h"
|
|
#include "qom/cpu.h"
|
|
#include "disas/disas.h"
|
|
|
|
/* cpu_dump_state() logging functions: */
|
|
/**
|
|
* log_cpu_state:
|
|
* @cpu: The CPU whose state is to be logged.
|
|
* @flags: Flags what to log.
|
|
*
|
|
* Logs the output of cpu_dump_state().
|
|
*/
|
|
static inline void log_cpu_state(CPUState *cpu, int flags)
|
|
{
|
|
if (qemu_log_enabled()) {
|
|
cpu_dump_state(cpu, qemu_logfile, flags);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* log_cpu_state_mask:
|
|
* @mask: Mask when to log.
|
|
* @cpu: The CPU whose state is to be logged.
|
|
* @flags: Flags what to log.
|
|
*
|
|
* Logs the output of cpu_dump_state() if loglevel includes @mask.
|
|
*/
|
|
static inline void log_cpu_state_mask(int mask, CPUState *cpu, int flags)
|
|
{
|
|
if (qemu_loglevel & mask) {
|
|
log_cpu_state(cpu, flags);
|
|
}
|
|
}
|
|
|
|
#ifdef NEED_CPU_H
|
|
/* disas() and target_disas() to qemu_logfile: */
|
|
static inline void log_target_disas(CPUState *cpu, target_ulong start,
|
|
target_ulong len)
|
|
{
|
|
target_disas(qemu_logfile, cpu, start, len);
|
|
}
|
|
|
|
static inline void log_disas(void *code, unsigned long size)
|
|
{
|
|
disas(qemu_logfile, code, size);
|
|
}
|
|
|
|
#if defined(CONFIG_USER_ONLY)
|
|
/* page_dump() output to the log file: */
|
|
static inline void log_page_dump(void)
|
|
{
|
|
page_dump(qemu_logfile);
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|