Commit 90c84c56 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qom/cpu: Simplify how CPUClass:cpu_dump_state() prints 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190417191805.28198-15-armbru@redhat.com>
parent 19aaa4c3

accel/kvm/kvm-all.c

+2 −2
Original line number Diff line number Diff line
@@ -1798,7 +1798,7 @@ static int kvm_handle_internal_error(CPUState *cpu, struct kvm_run *run) 
    if (run->internal.suberror == KVM_INTERNAL_ERROR_EMULATION) {

        fprintf(stderr, "emulation failure\n");

        if (!kvm_arch_stop_on_emulation_error(cpu)) {

            cpu_dump_state(cpu, stderr, fprintf, CPU_DUMP_CODE);

            cpu_dump_state(cpu, stderr, CPU_DUMP_CODE);

            return EXCP_INTERRUPT;

        }

    }
@@ -2089,7 +2089,7 @@ int kvm_cpu_exec(CPUState *cpu) 
    qemu_mutex_lock_iothread();



    if (ret < 0) {

        cpu_dump_state(cpu, stderr, fprintf, CPU_DUMP_CODE);

        cpu_dump_state(cpu, stderr, CPU_DUMP_CODE);

        vm_stop(RUN_STATE_INTERNAL_ERROR);

    }

bsd-user/main.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ void cpu_loop(CPUSPARCState *env) 
        badtrap:

#endif

            printf ("Unhandled trap: 0x%x\n", trapnr);

            cpu_dump_state(cs, stderr, fprintf, 0);

            cpu_dump_state(cs, stderr, 0);

            exit (1);

        }

        process_pending_signals (env);

cpus.c

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ void hw_error(const char *fmt, ...) 
    fprintf(stderr, "\n");

    CPU_FOREACH(cpu) {

        fprintf(stderr, "CPU #%d:\n", cpu->cpu_index);

        cpu_dump_state(cpu, stderr, fprintf, CPU_DUMP_FPU);

        cpu_dump_state(cpu, stderr, CPU_DUMP_FPU);

    }

    va_end(ap);

    abort();

exec.c

+1 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) 
    fprintf(stderr, "qemu: fatal: ");

    vfprintf(stderr, fmt, ap);

    fprintf(stderr, "\n");

    cpu_dump_state(cpu, stderr, fprintf, CPU_DUMP_FPU | CPU_DUMP_CCOP);

    cpu_dump_state(cpu, stderr, CPU_DUMP_FPU | CPU_DUMP_CCOP);

    if (qemu_log_separate()) {

        qemu_log_lock();

        qemu_log("qemu: fatal: ");

include/exec/log.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
static inline void log_cpu_state(CPUState *cpu, int flags)

{

    if (qemu_log_enabled()) {

        cpu_dump_state(cpu, qemu_logfile, fprintf, flags);

        cpu_dump_state(cpu, qemu_logfile, flags);

    }

}