Commit 11cb6c15 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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



CPUClass method dump_statistics() takes an fprintf()-like callback and
a FILE * to pass to it.

Its only caller hmp_info_cpustats() (via cpu_dump_statistics()) passes
monitor_fprintf() and the current monitor cast to FILE *.
monitor_fprintf() casts it right back, and is otherwise identical to
monitor_printf().  The type-punning is ugly.

Drop the callback, and call qemu_printf() instead.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190417191805.28198-13-armbru@redhat.com>
parent d3fd9e4b

include/qom/cpu.h

+4 −7
Original line number Diff line number Diff line
@@ -184,8 +184,7 @@ typedef struct CPUClass { 
    void (*dump_state)(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,

                       int flags);

    GuestPanicInformation* (*get_crash_info)(CPUState *cpu);

    void (*dump_statistics)(CPUState *cpu, FILE *f,

                            fprintf_function cpu_fprintf, int flags);

    void (*dump_statistics)(CPUState *cpu, int flags);

    int64_t (*get_arch_id)(CPUState *cpu);

    bool (*get_paging_enabled)(const CPUState *cpu);

    void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list,
@@ -576,14 +575,12 @@ void cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, 
/**

 * cpu_dump_statistics:

 * @cpu: The CPU whose state is to be dumped.

 * @f: File to dump to.

 * @cpu_fprintf: Function to dump with.

 * @flags: Flags what to dump.

 *

 * Dumps CPU statistics.

 * Dump CPU statistics to the current monitor if we have one, else to

 * stdout.

 */

void cpu_dump_statistics(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,

                         int flags);

void cpu_dump_statistics(CPUState *cpu, int flags);



#ifndef CONFIG_USER_ONLY

/**

monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ static void hmp_info_cpustats(Monitor *mon, const QDict *qdict) 
        monitor_printf(mon, "No CPU available\n");

        return;

    }

    cpu_dump_statistics(cs, (FILE *)mon, &monitor_fprintf, 0);

    cpu_dump_statistics(cs, 0);

}



static void hmp_info_trace_events(Monitor *mon, const QDict *qdict)

qom/cpu.c

+2 −3
Original line number Diff line number Diff line
@@ -230,13 +230,12 @@ void cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, 
    }

}



void cpu_dump_statistics(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,

                         int flags)

void cpu_dump_statistics(CPUState *cpu, int flags)

{

    CPUClass *cc = CPU_GET_CLASS(cpu);



    if (cc->dump_statistics) {

        cc->dump_statistics(cpu, f, cpu_fprintf, flags);

        cc->dump_statistics(cpu, flags);

    }

}

target/ppc/cpu.h

+1 −2
Original line number Diff line number Diff line
@@ -1270,8 +1270,7 @@ void ppc_cpu_do_interrupt(CPUState *cpu); 
bool ppc_cpu_exec_interrupt(CPUState *cpu, int int_req);

void ppc_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,

                        int flags);

void ppc_cpu_dump_statistics(CPUState *cpu, FILE *f,

                             fprintf_function cpu_fprintf, int flags);

void ppc_cpu_dump_statistics(CPUState *cpu, int flags);

hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);

int ppc_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);

int ppc_cpu_gdb_read_register_apple(CPUState *cpu, uint8_t *buf, int reg);

target/ppc/translate.c

+4 −5
Original line number Diff line number Diff line
@@ -7593,8 +7593,7 @@ void ppc_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, 
#undef RFPL

}



void ppc_cpu_dump_statistics(CPUState *cs, FILE*f,

                             fprintf_function cpu_fprintf, int flags)

void ppc_cpu_dump_statistics(CPUState *cs, int flags)

{

#if defined(DO_PPC_STATISTICS)

    PowerPCCPU *cpu = POWERPC_CPU(cs);
@@ -7614,7 +7613,7 @@ void ppc_cpu_dump_statistics(CPUState *cs, FILE*f, 
                        handler = t3[op3];

                        if (handler->count == 0)

                            continue;

                        cpu_fprintf(f, "%02x %02x %02x (%02x %04d) %16s: "

                        qemu_printf("%02x %02x %02x (%02x %04d) %16s: "

                                    "%016" PRIx64 " %" PRId64 "\n",

                                    op1, op2, op3, op1, (op3 << 5) | op2,

                                    handler->oname,
@@ -7623,7 +7622,7 @@ void ppc_cpu_dump_statistics(CPUState *cs, FILE*f, 
                } else {

                    if (handler->count == 0)

                        continue;

                    cpu_fprintf(f, "%02x %02x    (%02x %04d) %16s: "

                    qemu_printf("%02x %02x    (%02x %04d) %16s: "

                                "%016" PRIx64 " %" PRId64 "\n",

                                op1, op2, op1, op2, handler->oname,

                                handler->count, handler->count);
@@ -7632,7 +7631,7 @@ void ppc_cpu_dump_statistics(CPUState *cs, FILE*f, 
        } else {

            if (handler->count == 0)

                continue;

            cpu_fprintf(f, "%02x       (%02x     ) %16s: %016" PRIx64

            qemu_printf("%02x       (%02x     ) %16s: %016" PRIx64

                        " %" PRId64 "\n",

                        op1, op1, handler->oname,

                        handler->count, handler->count);