Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-17 16:03:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/ppc: Avoid using Monitor in xive_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-12-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 15:18:30 +02:00
parent dbcbb8c00f
commit bc8c553b89
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/intc/pnv_xive.c
View File

@ -1864,19 +1864,19 @@ void pnv_xive_pic_print_info(PnvXive *xive, Monitor *mon)
g_string_append_printf(buf, "XIVE[%x] #%d Source %08x .. %08x\n", g_string_append_printf(buf, "XIVE[%x] #%d Source %08x .. %08x\n",
chip_id, blk, srcno0, srcno0 + nr_ipis - 1); chip_id, blk, srcno0, srcno0 + nr_ipis - 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);
monitor_puts(mon, info->human_readable_text);
monitor_printf(mon, "XIVE[%x] #%d EAT %08x .. %08x\n", chip_id, blk, g_string_append_printf(buf, "XIVE[%x] #%d EAT %08x .. %08x\n",
srcno0, srcno0 + nr_ipis - 1); chip_id, blk, srcno0, srcno0 + nr_ipis - 1);
for (i = 0; i < nr_ipis; i++) { for (i = 0; i < nr_ipis; i++) {
if (xive_router_get_eas(xrtr, blk, i, &eas)) { if (xive_router_get_eas(xrtr, blk, i, &eas)) {
break; break;
} }
if (!xive_eas_is_masked(&eas)) { if (!xive_eas_is_masked(&eas)) {
xive_eas_pic_print_info(&eas, i, mon); xive_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 ENDT\n", chip_id, blk); monitor_printf(mon, "XIVE[%x] #%d ENDT\n", chip_id, blk);
i = 0; i = 0;

12
hw/intc/xive.c
View File

@ -1921,17 +1921,17 @@ static const TypeInfo xive_router_info = {
} }
}; };
void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon) void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, GString *buf)
{ {
if (!xive_eas_is_valid(eas)) { if (!xive_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, xive_eas_is_masked(eas) ? "M" : " ", lisn, xive_eas_is_masked(eas) ? "M" : " ",
(uint8_t) xive_get_field64(EAS_END_BLOCK, eas->w), (uint8_t) xive_get_field64(EAS_END_BLOCK, eas->w),
(uint32_t) xive_get_field64(EAS_END_INDEX, eas->w), (uint32_t) xive_get_field64(EAS_END_INDEX, eas->w),
(uint32_t) xive_get_field64(EAS_END_DATA, eas->w)); (uint32_t) xive_get_field64(EAS_END_DATA, eas->w));
} }
/* /*

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

@ -167,7 +167,7 @@ typedef struct XiveEAS {
#define xive_eas_is_valid(eas) (be64_to_cpu((eas)->w) & EAS_VALID) #define xive_eas_is_valid(eas) (be64_to_cpu((eas)->w) & EAS_VALID)
#define xive_eas_is_masked(eas) (be64_to_cpu((eas)->w) & EAS_MASKED) #define xive_eas_is_masked(eas) (be64_to_cpu((eas)->w) & EAS_MASKED)
void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, Monitor *mon); void xive_eas_pic_print_info(XiveEAS *eas, uint32_t lisn, GString *buf);
static inline uint64_t xive_get_field64(uint64_t mask, uint64_t word) static inline uint64_t xive_get_field64(uint64_t mask, uint64_t word)
{ {