david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spapr: Add return value to spapr_irq_check()

Browse Source 
Explicitly return success or failure, rather than just relying on the
Error ** parameter.  This makes handling it less verbose in the caller.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
This commit is contained in:
David Gibson 2019-09-30 12:20:47 +10:00
parent ca62823b79
commit 0a3fd3df6f
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/ppc/spapr_irq.c
View File

@ -529,7 +529,7 @@ SpaprIrq spapr_irq_dual = {
}; };
static void spapr_irq_check(SpaprMachineState *spapr, Error **errp) static int spapr_irq_check(SpaprMachineState *spapr, Error **errp)
{ {
MachineState *machine = MACHINE(spapr); MachineState *machine = MACHINE(spapr);
@ -545,7 +545,7 @@ static void spapr_irq_check(SpaprMachineState *spapr, Error **errp)
*/ */
if (spapr->irq == &spapr_irq_dual) { if (spapr->irq == &spapr_irq_dual) {
spapr->irq = &spapr_irq_xics; spapr->irq = &spapr_irq_xics;
return; return 0;
} }
/* /*
@ -565,7 +565,7 @@ static void spapr_irq_check(SpaprMachineState *spapr, Error **errp)
*/ */
if (spapr->irq == &spapr_irq_xive) { if (spapr->irq == &spapr_irq_xive) {
error_setg(errp, "XIVE-only machines require a POWER9 CPU"); error_setg(errp, "XIVE-only machines require a POWER9 CPU");
return; return -1;
} }
} }
@ -579,8 +579,10 @@ static void spapr_irq_check(SpaprMachineState *spapr, Error **errp)
machine_kernel_irqchip_required(machine) && machine_kernel_irqchip_required(machine) &&
xics_kvm_has_broken_disconnect(spapr)) { xics_kvm_has_broken_disconnect(spapr)) {
error_setg(errp, "KVM is too old to support ic-mode=dual,kernel-irqchip=on"); error_setg(errp, "KVM is too old to support ic-mode=dual,kernel-irqchip=on");
return; return -1;
} }
return 0;
} }
/* /*
@ -589,7 +591,6 @@ static void spapr_irq_check(SpaprMachineState *spapr, Error **errp)
void spapr_irq_init(SpaprMachineState *spapr, Error **errp) void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
{ {
MachineState *machine = MACHINE(spapr); MachineState *machine = MACHINE(spapr);
Error *local_err = NULL;
if (machine_kernel_irqchip_split(machine)) { if (machine_kernel_irqchip_split(machine)) {
error_setg(errp, "kernel_irqchip split mode not supported on pseries"); error_setg(errp, "kernel_irqchip split mode not supported on pseries");
@ -602,9 +603,7 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
return; return;
} }
spapr_irq_check(spapr, &local_err); if (spapr_irq_check(spapr, errp) < 0) {
if (local_err) {
error_propagate(errp, local_err);
return; return;
} }