mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/ppc: Avoid using Monitor in spapr_irq_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-25-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-07 16:24:04 +02:00
parent 4abeadf651
commit f50bb2a26a
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/ppc/spapr.c
View File

@ -31,6 +31,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-events-machine.h" #include "qapi/qapi-events-machine.h"
#include "qapi/qapi-events-qdev.h" #include "qapi/qapi-events-qdev.h"
#include "qapi/type-helpers.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "sysemu/hostmem.h" #include "sysemu/hostmem.h"
@ -4530,10 +4531,14 @@ static void spapr_pic_print_info(InterruptStatsProvider *obj,
Monitor *mon) Monitor *mon)
{ {
SpaprMachineState *spapr = SPAPR_MACHINE(obj); SpaprMachineState *spapr = SPAPR_MACHINE(obj);
g_autoptr(GString) buf = g_string_new("");
g_autoptr(HumanReadableText) info = NULL;
spapr_irq_print_info(spapr, mon); spapr_irq_print_info(spapr, buf);
monitor_printf(mon, "irqchip: %s\n", g_string_append_printf(buf, "irqchip: %s\n",
kvm_irqchip_in_kernel() ? "in-kernel" : "emulated"); kvm_irqchip_in_kernel() ? "in-kernel" : "emulated");
info = human_readable_text_from_str(buf);
monitor_puts(mon, info->human_readable_text);
} }
/* /*

8
hw/ppc/spapr_irq.c
View File

@ -11,7 +11,6 @@
#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"
@ -19,7 +18,6 @@
#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"
@ -267,16 +265,12 @@ static void spapr_set_irq(void *opaque, int irq, int level)
sicc->set_irq(spapr->active_intc, irq, level); sicc->set_irq(spapr->active_intc, irq, level);
} }
void spapr_irq_print_info(SpaprMachineState *spapr, Monitor *mon) void spapr_irq_print_info(SpaprMachineState *spapr, GString *buf)
{ {
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, buf); 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

@ -85,7 +85,7 @@ int spapr_irq_cpu_intc_create(struct SpaprMachineState *spapr,
PowerPCCPU *cpu, Error **errp); PowerPCCPU *cpu, Error **errp);
void spapr_irq_cpu_intc_reset(struct SpaprMachineState *spapr, PowerPCCPU *cpu); void spapr_irq_cpu_intc_reset(struct SpaprMachineState *spapr, PowerPCCPU *cpu);
void spapr_irq_cpu_intc_destroy(struct SpaprMachineState *spapr, PowerPCCPU *cpu); void spapr_irq_cpu_intc_destroy(struct SpaprMachineState *spapr, PowerPCCPU *cpu);
void spapr_irq_print_info(struct SpaprMachineState *spapr, Monitor *mon); void spapr_irq_print_info(struct SpaprMachineState *spapr, GString *buf);
void spapr_irq_dt(struct SpaprMachineState *spapr, uint32_t nr_servers, void spapr_irq_dt(struct SpaprMachineState *spapr, uint32_t nr_servers,
void *fdt, uint32_t phandle); void *fdt, uint32_t phandle);