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

hw/ppc: Avoid using Monitor in xive2_eas_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-18-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 15:59:41 +02:00
parent d88f39dba4
commit 0018666462
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hw/intc/pnv_xive2.c
View file

@ -2120,24 +2120,24 @@ void pnv_xive2_pic_print_info(PnvXive2 *xive, Monitor *mon)
g_autoptr(GString) buf = g_string_new(""); g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL; g_autoptr(HumanReadableText) info = NULL;
monitor_printf(mon, "XIVE[%x] Source %08x .. %08x\n", blk, srcno0, g_string_append_printf(buf, "XIVE[%x] Source %08x .. %08x\n",
srcno0 + nr_esbs - 1); blk, srcno0, srcno0 + nr_esbs - 1);
xive_source_pic_print_info(&xive->ipi_source, srcno0, buf); xive_source_pic_print_info(&xive->ipi_source, srcno0, buf);
info = human_readable_text_from_str(buf); g_string_append_printf(buf, "XIVE[%x] EAT %08x .. %08x\n",
monitor_puts(mon, info->human_readable_text); blk, srcno0, srcno0 + nr_esbs - 1);
monitor_printf(mon, "XIVE[%x] EAT %08x .. %08x\n", blk, srcno0,
srcno0 + nr_esbs - 1);
for (i = 0; i < nr_esbs; i++) { for (i = 0; i < nr_esbs; i++) {
if (xive2_router_get_eas(xrtr, blk, i, &eas)) { if (xive2_router_get_eas(xrtr, blk, i, &eas)) {
break; break;
} }
if (!xive2_eas_is_masked(&eas)) { if (!xive2_eas_is_masked(&eas)) {
xive2_eas_pic_print_info(&eas, i, mon); xive2_eas_pic_print_info(&eas, i, buf);
} }
} }
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
monitor_printf(mon, "XIVE[%x] #%d END Escalation EAT\n", chip_id, blk); monitor_printf(mon, "XIVE[%x] #%d END Escalation EAT\n", chip_id, blk);
i = 0; i = 0;
while (!xive2_router_get_end(xrtr, blk, i, &end)) { while (!xive2_router_get_end(xrtr, blk, i, &end)) {

12
hw/intc/xive2.c
View file

@ -27,17 +27,17 @@ uint32_t xive2_router_get_config(Xive2Router *xrtr)
return xrc->get_config(xrtr); return xrc->get_config(xrtr);
} }
void xive2_eas_pic_print_info(Xive2Eas *eas, uint32_t lisn, Monitor *mon) void xive2_eas_pic_print_info(Xive2Eas *eas, uint32_t lisn, GString *buf)
{ {
if (!xive2_eas_is_valid(eas)) { if (!xive2_eas_is_valid(eas)) {
return; return;
} }
monitor_printf(mon, " %08x %s end:%02x/%04x data:%08x\n", g_string_append_printf(buf, " %08x %s end:%02x/%04x data:%08x\n",
lisn, xive2_eas_is_masked(eas) ? "M" : " ", lisn, xive2_eas_is_masked(eas) ? "M" : " ",
(uint8_t) xive_get_field64(EAS2_END_BLOCK, eas->w), (uint8_t) xive_get_field64(EAS2_END_BLOCK, eas->w),
(uint32_t) xive_get_field64(EAS2_END_INDEX, eas->w), (uint32_t) xive_get_field64(EAS2_END_INDEX, eas->w),
(uint32_t) xive_get_field64(EAS2_END_DATA, eas->w)); (uint32_t) xive_get_field64(EAS2_END_DATA, eas->w));
} }
void xive2_end_queue_pic_print_info(Xive2End *end, uint32_t width, void xive2_end_queue_pic_print_info(Xive2End *end, uint32_t width,

2
include/hw/ppc/xive2_regs.h
View file

@ -48,7 +48,7 @@ typedef struct Xive2Eas {
#define xive2_eas_is_valid(eas) (be64_to_cpu((eas)->w) & EAS2_VALID) #define xive2_eas_is_valid(eas) (be64_to_cpu((eas)->w) & EAS2_VALID)
#define xive2_eas_is_masked(eas) (be64_to_cpu((eas)->w) & EAS2_MASKED) #define xive2_eas_is_masked(eas) (be64_to_cpu((eas)->w) & EAS2_MASKED)
void xive2_eas_pic_print_info(Xive2Eas *eas, uint32_t lisn, Monitor *mon); void xive2_eas_pic_print_info(Xive2Eas *eas, uint32_t lisn, GString *buf);
/* /*
* Event Notifification Descriptor (END) * Event Notifification Descriptor (END)