ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/ppc: Avoid using Monitor in pnv_psi_pic_print_info() 

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-17-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 15:56:36 +02:00
parent 0527563a47
commit d88f39dba4
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/ppc/pnv.c
View File

@ -812,12 +812,11 @@ static void pnv_chip_power9_pic_print_info(PnvChip *chip, Monitor *mon)
g_autoptr(HumanReadableText) info = NULL; g_autoptr(HumanReadableText) info = NULL;
pnv_xive_pic_print_info(&chip9->xive, buf); pnv_xive_pic_print_info(&chip9->xive, buf);
pnv_psi_pic_print_info(&chip9->psi, buf);
info = human_readable_text_from_str(buf); info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text); monitor_puts(mon, info->human_readable_text);
pnv_psi_pic_print_info(&chip9->psi, mon);
object_child_foreach_recursive(OBJECT(chip), object_child_foreach_recursive(OBJECT(chip),
pnv_chip_power9_pic_print_info_child, mon); pnv_chip_power9_pic_print_info_child, mon);
} }
@ -862,9 +861,14 @@ static void pnv_ipmi_bt_init(ISABus *bus, IPMIBmc *bmc, uint32_t irq)
static void pnv_chip_power10_pic_print_info(PnvChip *chip, Monitor *mon) static void pnv_chip_power10_pic_print_info(PnvChip *chip, Monitor *mon)
{ {
Pnv10Chip *chip10 = PNV10_CHIP(chip); Pnv10Chip *chip10 = PNV10_CHIP(chip);
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
pnv_xive2_pic_print_info(&chip10->xive, mon); pnv_xive2_pic_print_info(&chip10->xive, mon);
pnv_psi_pic_print_info(&chip10->psi, mon);
pnv_psi_pic_print_info(&chip10->psi, buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
object_child_foreach_recursive(OBJECT(chip), object_child_foreach_recursive(OBJECT(chip),
pnv_chip_power9_pic_print_info_child, mon); pnv_chip_power9_pic_print_info_child, mon);

9
hw/ppc/pnv_psi.c
View File

@ -25,8 +25,6 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/type-helpers.h"
#include "monitor/monitor.h"
#include "hw/ppc/fdt.h" #include "hw/ppc/fdt.h"
@ -978,11 +976,9 @@ static void pnv_psi_register_types(void)
type_init(pnv_psi_register_types); type_init(pnv_psi_register_types);
void pnv_psi_pic_print_info(Pnv9Psi *psi9, Monitor *mon) void pnv_psi_pic_print_info(Pnv9Psi *psi9, GString *buf)
{ {
PnvPsi *psi = PNV_PSI(psi9); PnvPsi *psi = PNV_PSI(psi9);
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
uint32_t offset = uint32_t offset =
(psi->regs[PSIHB_REG(PSIHB9_IVT_OFFSET)] >> PSIHB9_IVT_OFF_SHIFT); (psi->regs[PSIHB_REG(PSIHB9_IVT_OFFSET)] >> PSIHB9_IVT_OFF_SHIFT);
@ -990,7 +986,4 @@ void pnv_psi_pic_print_info(Pnv9Psi *psi9, Monitor *mon)
g_string_append_printf(buf, "PSIHB Source %08x .. %08x\n", g_string_append_printf(buf, "PSIHB Source %08x .. %08x\n",
offset, offset + psi9->source.nr_irqs - 1); offset, offset + psi9->source.nr_irqs - 1);
xive_source_pic_print_info(&psi9->source, offset, buf); xive_source_pic_print_info(&psi9->source, offset, buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }

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

@ -110,6 +110,6 @@ typedef enum PnvPsiIrq {
#define PSIHB9_IRQ_PSU 13 #define PSIHB9_IRQ_PSU 13
#define PSIHB9_NUM_IRQS 14 #define PSIHB9_NUM_IRQS 14
void pnv_psi_pic_print_info(Pnv9Psi *psi, Monitor *mon); void pnv_psi_pic_print_info(Pnv9Psi *psi, GString *buf);
#endif /* PPC_PNV_PSI_H */ #endif /* PPC_PNV_PSI_H */