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 SpaprInterruptControllerClass::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-24-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 16:21:05 +02:00
parent 70fb275d07
commit 4abeadf651
4 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/intc/spapr_xive.c
View File

@ -11,13 +11,11 @@
#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 "qemu/error-report.h" #include "qemu/error-report.h"
#include "target/ppc/cpu.h" #include "target/ppc/cpu.h"
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "monitor/monitor.h"
#include "hw/ppc/fdt.h" #include "hw/ppc/fdt.h"
#include "hw/ppc/spapr.h" #include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/spapr_cpu_core.h"
@ -701,12 +699,10 @@ static void spapr_xive_set_irq(SpaprInterruptController *intc, int irq, int val)
} }
} }
static void spapr_xive_print_info(SpaprInterruptController *intc, Monitor *mon) static void spapr_xive_print_info(SpaprInterruptController *intc, GString *buf)
{ {
SpaprXive *xive = SPAPR_XIVE(intc); SpaprXive *xive = SPAPR_XIVE(intc);
CPUState *cs; CPUState *cs;
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
CPU_FOREACH(cs) { CPU_FOREACH(cs) {
PowerPCCPU *cpu = POWERPC_CPU(cs); PowerPCCPU *cpu = POWERPC_CPU(cs);
@ -714,9 +710,6 @@ static void spapr_xive_print_info(SpaprInterruptController *intc, Monitor *mon)
xive_tctx_pic_print_info(spapr_cpu_state(cpu)->tctx, buf); xive_tctx_pic_print_info(spapr_cpu_state(cpu)->tctx, buf);
} }
spapr_xive_pic_print_info(xive, buf); spapr_xive_pic_print_info(xive, buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }
static void spapr_xive_dt(SpaprInterruptController *intc, uint32_t nr_servers, static void spapr_xive_dt(SpaprInterruptController *intc, uint32_t nr_servers,

9
hw/intc/xics_spapr.c
View File

@ -34,8 +34,6 @@
#include "hw/ppc/xics_spapr.h" #include "hw/ppc/xics_spapr.h"
#include "hw/ppc/fdt.h" #include "hw/ppc/fdt.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qapi/type-helpers.h"
#include "monitor/monitor.h"
/* /*
* Guest interfaces * Guest interfaces
@ -397,12 +395,10 @@ static void xics_spapr_set_irq(SpaprInterruptController *intc, int irq, int val)
ics_set_irq(ics, srcno, val); ics_set_irq(ics, srcno, val);
} }
static void xics_spapr_print_info(SpaprInterruptController *intc, Monitor *mon) static void xics_spapr_print_info(SpaprInterruptController *intc, GString *buf)
{ {
ICSState *ics = ICS_SPAPR(intc); ICSState *ics = ICS_SPAPR(intc);
CPUState *cs; CPUState *cs;
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
CPU_FOREACH(cs) { CPU_FOREACH(cs) {
PowerPCCPU *cpu = POWERPC_CPU(cs); PowerPCCPU *cpu = POWERPC_CPU(cs);
@ -410,9 +406,6 @@ static void xics_spapr_print_info(SpaprInterruptController *intc, Monitor *mon)
icp_pic_print_info(spapr_cpu_state(cpu)->icp, buf); icp_pic_print_info(spapr_cpu_state(cpu)->icp, buf);
} }
ics_pic_print_info(ics, buf); ics_pic_print_info(ics, buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }
static int xics_spapr_post_load(SpaprInterruptController *intc, int version_id) static int xics_spapr_post_load(SpaprInterruptController *intc, int version_id)

8
hw/ppc/spapr_irq.c
View File

@ -11,6 +11,7 @@
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/type-helpers.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/ppc/spapr.h" #include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/spapr_cpu_core.h"
@ -18,6 +19,7 @@
#include "hw/ppc/xics.h" #include "hw/ppc/xics.h"
#include "hw/ppc/xics_spapr.h" #include "hw/ppc/xics_spapr.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "monitor/monitor.h"
#include "cpu-models.h" #include "cpu-models.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
@ -269,8 +271,12 @@ void spapr_irq_print_info(SpaprMachineState *spapr, Monitor *mon)
{ {
SpaprInterruptControllerClass *sicc SpaprInterruptControllerClass *sicc
= SPAPR_INTC_GET_CLASS(spapr->active_intc); = SPAPR_INTC_GET_CLASS(spapr->active_intc);
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
sicc->print_info(spapr->active_intc, mon); sicc->print_info(spapr->active_intc, buf);
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }
void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers, void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers,

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

@ -73,7 +73,7 @@ struct SpaprInterruptControllerClass {
/* These methods should only be called on the active intc */ /* These methods should only be called on the active intc */
void (*set_irq)(SpaprInterruptController *intc, int irq, int val); void (*set_irq)(SpaprInterruptController *intc, int irq, int val);
void (*print_info)(SpaprInterruptController *intc, Monitor *mon); void (*print_info)(SpaprInterruptController *intc, GString *buf);
void (*dt)(SpaprInterruptController *intc, uint32_t nr_servers, void (*dt)(SpaprInterruptController *intc, uint32_t nr_servers,
void *fdt, uint32_t phandle); void *fdt, uint32_t phandle);
int (*post_load)(SpaprInterruptController *intc, int version_id); int (*post_load)(SpaprInterruptController *intc, int version_id);