motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-30 21:42:06 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/ppc: Avoid using Monitor in xive_nvt_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-15-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 15:24:07 +02:00
parent 3d1e062c80
commit 1a40b0ca9e
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hw/intc/pnv_xive.c
View file

@ -1832,7 +1832,7 @@ static const MemoryRegionOps pnv_xive_pc_ops = {
}; };
static void xive_nvt_pic_print_info(XiveNVT *nvt, uint32_t nvt_idx, static void xive_nvt_pic_print_info(XiveNVT *nvt, uint32_t nvt_idx,
Monitor *mon) GString *buf)
{ {
uint8_t eq_blk = xive_get_field32(NVT_W1_EQ_BLOCK, nvt->w1); uint8_t eq_blk = xive_get_field32(NVT_W1_EQ_BLOCK, nvt->w1);
uint32_t eq_idx = xive_get_field32(NVT_W1_EQ_INDEX, nvt->w1); uint32_t eq_idx = xive_get_field32(NVT_W1_EQ_INDEX, nvt->w1);
@ -1841,9 +1841,9 @@ static void xive_nvt_pic_print_info(XiveNVT *nvt, uint32_t nvt_idx,
return; return;
} }
monitor_printf(mon, " %08x end:%02x/%04x IPB:%02x\n", nvt_idx, g_string_append_printf(buf, " %08x end:%02x/%04x IPB:%02x\n",
eq_blk, eq_idx, nvt_idx, eq_blk, eq_idx,
xive_get_field32(NVT_W4_IPB, nvt->w4)); xive_get_field32(NVT_W4_IPB, nvt->w4));
} }
void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon) void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon)
@ -1888,17 +1888,18 @@ void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon)
while (!xive_router_get_end(xrtr, blk, i, &end)) { while (!xive_router_get_end(xrtr, blk, i, &end)) {
xive_end_eas_pic_print_info(&end, i++, buf); xive_end_eas_pic_print_info(&end, i++, buf);
} }
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
monitor_printf(mon, "XIVE[%x] #%d NVTT %08x .. %08x\n", chip_id, blk, g_string_append_printf(buf, "XIVE[%x] #%d NVTT %08x .. %08x\n",
0, XIVE_NVT_COUNT - 1); chip_id, blk, 0, XIVE_NVT_COUNT - 1);
xive_nvt_per_subpage = pnv_xive_vst_per_subpage(xive, VST_TSEL_VPDT); xive_nvt_per_subpage = pnv_xive_vst_per_subpage(xive, VST_TSEL_VPDT);
for (i = 0; i < XIVE_NVT_COUNT; i += xive_nvt_per_subpage) { for (i = 0; i < XIVE_NVT_COUNT; i += xive_nvt_per_subpage) {
while (!xive_router_get_nvt(xrtr, blk, i, &nvt)) { while (!xive_router_get_nvt(xrtr, blk, i, &nvt)) {
xive_nvt_pic_print_info(&nvt, i++, mon); xive_nvt_pic_print_info(&nvt, i++, buf);
} }
} }
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }
static void pnv_xive_reset(void *dev) static void pnv_xive_reset(void *dev)