SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/ppc: Avoid using Monitor in xive_tctx_pic_print_info()

Browse Source 
Replace Monitor API by HumanReadableText one.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Message-Id: <20240610062105.49848-4-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 13:11:08 +02:00
parent 5242494c05
commit f163e2707e
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/intc/spapr_xive.c
View File

@ -11,6 +11,7 @@
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/type-helpers.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "target/ppc/cpu.h" #include "target/ppc/cpu.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
@ -703,12 +704,16 @@ static void spapr_xive_print_info(SpaprInterruptController *intc, Monitor *mon)
{ {
SpaprXive *xive = SPAPR_XIVE(intc); SpaprXive *xive = SPAPR_XIVE(intc);
CPUState *cs; CPUState *cs;
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
CPU_FOREACH(cs) { CPU_FOREACH(cs) {
PowerPCCPU *cpu = POWERPC_CPU(cs); PowerPCCPU *cpu = POWERPC_CPU(cs);
xive_tctx_pic_print_info(spapr_cpu_state(cpu)->tctx, mon); xive_tctx_pic_print_info(spapr_cpu_state(cpu)->tctx, buf);
} }
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
spapr_xive_pic_print_info(xive, mon); spapr_xive_pic_print_info(xive, mon);
} }

11
hw/intc/xive.c
View File

@ -669,7 +669,7 @@ static const char * const xive_tctx_ring_names[] = {
xpc->in_kernel ? xpc->in_kernel(xptr) : false; \ xpc->in_kernel ? xpc->in_kernel(xptr) : false; \
})) }))
void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon) void xive_tctx_pic_print_info(XiveTCTX *tctx, GString *buf)
{ {
int cpu_index; int cpu_index;
int i; int i;
@ -693,13 +693,14 @@ void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon)
} }
} }
monitor_printf(mon, "CPU[%04x]: QW NSR CPPR IPB LSMFB ACK# INC AGE PIPR" g_string_append_printf(buf, "CPU[%04x]: "
" W2\n", cpu_index); "QW NSR CPPR IPB LSMFB ACK# INC AGE PIPR W2\n",
cpu_index);
for (i = 0; i < XIVE_TM_RING_COUNT; i++) { for (i = 0; i < XIVE_TM_RING_COUNT; i++) {
char *s = xive_tctx_ring_print(&tctx->regs[i * XIVE_TM_RING_SIZE]); char *s = xive_tctx_ring_print(&tctx->regs[i * XIVE_TM_RING_SIZE]);
monitor_printf(mon, "CPU[%04x]: %4s %s\n", cpu_index, g_string_append_printf(buf, "CPU[%04x]: %4s %s\n",
xive_tctx_ring_names[i], s); cpu_index, xive_tctx_ring_names[i], s);
g_free(s); g_free(s);
} }
} }

16
hw/ppc/pnv.c
View File

@ -1223,7 +1223,13 @@ static void pnv_chip_power9_intc_destroy(PnvChip *chip, PowerPCCPU *cpu)
static void pnv_chip_power9_intc_print_info(PnvChip *chip, PowerPCCPU *cpu, static void pnv_chip_power9_intc_print_info(PnvChip *chip, PowerPCCPU *cpu,
Monitor *mon) Monitor *mon)
{ {
xive_tctx_pic_print_info(XIVE_TCTX(pnv_cpu_state(cpu)->intc), mon); g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
xive_tctx_pic_print_info(XIVE_TCTX(pnv_cpu_state(cpu)->intc), buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }
static void pnv_chip_power10_intc_create(PnvChip *chip, PowerPCCPU *cpu, static void pnv_chip_power10_intc_create(PnvChip *chip, PowerPCCPU *cpu,
@ -1267,7 +1273,13 @@ static void pnv_chip_power10_intc_destroy(PnvChip *chip, PowerPCCPU *cpu)
static void pnv_chip_power10_intc_print_info(PnvChip *chip, PowerPCCPU *cpu, static void pnv_chip_power10_intc_print_info(PnvChip *chip, PowerPCCPU *cpu,
Monitor *mon) Monitor *mon)
{ {
xive_tctx_pic_print_info(XIVE_TCTX(pnv_cpu_state(cpu)->intc), mon); g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
xive_tctx_pic_print_info(XIVE_TCTX(pnv_cpu_state(cpu)->intc), buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }
/* /*

2
include/hw/ppc/xive.h
View File

@ -528,7 +528,7 @@ void xive_tctx_tm_write(XivePresenter *xptr, XiveTCTX *tctx, hwaddr offset,
uint64_t xive_tctx_tm_read(XivePresenter *xptr, XiveTCTX *tctx, hwaddr offset, uint64_t xive_tctx_tm_read(XivePresenter *xptr, XiveTCTX *tctx, hwaddr offset,
unsigned size); unsigned size);
void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon); void xive_tctx_pic_print_info(XiveTCTX *tctx, GString *buf);
Object *xive_tctx_create(Object *cpu, XivePresenter *xptr, Error **errp); Object *xive_tctx_create(Object *cpu, XivePresenter *xptr, Error **errp);
void xive_tctx_reset(XiveTCTX *tctx); void xive_tctx_reset(XiveTCTX *tctx);
void xive_tctx_destroy(XiveTCTX *tctx); void xive_tctx_destroy(XiveTCTX *tctx);