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

hw/ppc: Avoid using Monitor in pnv_chip_power9_pic_print_info_child()

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-26-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 16:27:33 +02:00
parent f50bb2a26a
commit d312b62a2e
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/ppc/pnv.c
View file

@ -789,18 +789,14 @@ static void pnv_chip_power8_pic_print_info(PnvChip *chip, Monitor *mon)
static int pnv_chip_power9_pic_print_info_child(Object *child, void *opaque) static int pnv_chip_power9_pic_print_info_child(Object *child, void *opaque)
{ {
Monitor *mon = opaque; GString *buf = opaque;
PnvPHB *phb = (PnvPHB *) object_dynamic_cast(child, TYPE_PNV_PHB); PnvPHB *phb = (PnvPHB *) object_dynamic_cast(child, TYPE_PNV_PHB);
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
if (!phb) { if (!phb) {
return 0; return 0;
} }
pnv_phb4_pic_print_info(PNV_PHB4(phb->backend), buf); pnv_phb4_pic_print_info(PNV_PHB4(phb->backend), buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
return 0; return 0;
} }
@ -813,12 +809,11 @@ static void pnv_chip_power9_pic_print_info(PnvChip *chip, Monitor *mon)
pnv_xive_pic_print_info(&chip9->xive, buf); pnv_xive_pic_print_info(&chip9->xive, buf);
pnv_psi_pic_print_info(&chip9->psi, buf); pnv_psi_pic_print_info(&chip9->psi, buf);
object_child_foreach_recursive(OBJECT(chip),
pnv_chip_power9_pic_print_info_child, 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);
object_child_foreach_recursive(OBJECT(chip),
pnv_chip_power9_pic_print_info_child, mon);
} }
static uint64_t pnv_chip_power8_xscom_core_base(PnvChip *chip, static uint64_t pnv_chip_power8_xscom_core_base(PnvChip *chip,
@ -865,13 +860,12 @@ static void pnv_chip_power10_pic_print_info(PnvChip *chip, Monitor *mon)
g_autoptr(HumanReadableText) info = NULL; g_autoptr(HumanReadableText) info = NULL;
pnv_xive2_pic_print_info(&chip10->xive, buf); pnv_xive2_pic_print_info(&chip10->xive, buf);
pnv_psi_pic_print_info(&chip10->psi, buf); pnv_psi_pic_print_info(&chip10->psi, buf);
object_child_foreach_recursive(OBJECT(chip),
pnv_chip_power9_pic_print_info_child, 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);
object_child_foreach_recursive(OBJECT(chip),
pnv_chip_power9_pic_print_info_child, mon);
} }
/* Always give the first 1GB to chip 0 else we won't boot */ /* Always give the first 1GB to chip 0 else we won't boot */