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

hw/ppc: Avoid using Monitor in xive2_end_queue_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-20-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 16:04:56 +02:00
parent 9d5c1da9c0
commit fd32d82339
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/intc/xive2.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 "target/ppc/cpu.h" #include "target/ppc/cpu.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
@ -40,8 +41,7 @@ void xive2_eas_pic_print_info(Xive2Eas *eas, uint32_t lisn, GString *buf)
(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, GString *buf)
Monitor *mon)
{ {
uint64_t qaddr_base = xive2_end_qaddr(end); uint64_t qaddr_base = xive2_end_qaddr(end);
uint32_t qsize = xive_get_field32(END2_W3_QSIZE, end->w3); uint32_t qsize = xive_get_field32(END2_W3_QSIZE, end->w3);
@ -52,7 +52,7 @@ void xive2_end_queue_pic_print_info(Xive2End *end, uint32_t width,
/* /*
* print out the [ (qindex - (width - 1)) .. (qindex + 1)] window * print out the [ (qindex - (width - 1)) .. (qindex + 1)] window
*/ */
monitor_printf(mon, " [ "); g_string_append_printf(buf, " [ ");
qindex = (qindex - (width - 1)) & (qentries - 1); qindex = (qindex - (width - 1)) & (qentries - 1);
for (i = 0; i < width; i++) { for (i = 0; i < width; i++) {
uint64_t qaddr = qaddr_base + (qindex << 2); uint64_t qaddr = qaddr_base + (qindex << 2);
@ -64,11 +64,11 @@ void xive2_end_queue_pic_print_info(Xive2End *end, uint32_t width,
HWADDR_PRIx "\n", qaddr); HWADDR_PRIx "\n", qaddr);
return; return;
} }
monitor_printf(mon, "%s%08x ", i == width - 1 ? "^" : "", g_string_append_printf(buf, "%s%08x ", i == width - 1 ? "^" : "",
be32_to_cpu(qdata)); be32_to_cpu(qdata));
qindex = (qindex + 1) & (qentries - 1); qindex = (qindex + 1) & (qentries - 1);
} }
monitor_printf(mon, "]"); g_string_append_printf(buf, "]");
} }
void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, Monitor *mon) void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, Monitor *mon)
@ -108,9 +108,14 @@ void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, Monitor *mon)
priority, nvp_blk, nvp_idx); priority, nvp_blk, nvp_idx);
if (qaddr_base) { if (qaddr_base) {
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
monitor_printf(mon, " eq:@%08"PRIx64"% 6d/%5d ^%d", monitor_printf(mon, " eq:@%08"PRIx64"% 6d/%5d ^%d",
qaddr_base, qindex, qentries, qgen); qaddr_base, qindex, qentries, qgen);
xive2_end_queue_pic_print_info(end, 6, mon); xive2_end_queue_pic_print_info(end, 6, buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }
monitor_printf(mon, "\n"); monitor_printf(mon, "\n");
} }

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

@ -132,7 +132,7 @@ static inline uint64_t xive2_end_qaddr(Xive2End *end)
void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, Monitor *mon); void xive2_end_pic_print_info(Xive2End *end, uint32_t end_idx, Monitor *mon);
void xive2_end_queue_pic_print_info(Xive2End *end, uint32_t width, void xive2_end_queue_pic_print_info(Xive2End *end, uint32_t width,
Monitor *mon); GString *buf);
void xive2_end_eas_pic_print_info(Xive2End *end, uint32_t end_idx, void xive2_end_eas_pic_print_info(Xive2End *end, uint32_t end_idx,
GString *buf); GString *buf);