[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 2/6] spapr: fix error path of required kernel-irqc
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 2/6] spapr: fix error path of required kernel-irqchip |
Date: |
Tue, 16 May 2017 14:35:55 +1000 |
User-agent: |
Mutt/1.8.0 (2017-02-23) |
On Mon, May 15, 2017 at 01:39:26PM +0200, Greg Kurz wrote:
> QEMU should exit if the user explicitely asked for kernel-irqchip support
> and "xics-kvm" initialization fails.
>
> The changelog of commit 34f2af3d3edf ("spapr: Clean up misuse of qdev_init()
> in xics-kvm creation") reads:
>
> While there, improve the error message when we can't satisfy an
> explicit user request for "xics-kvm", and exit(1) instead of abort().
> Simplify the abort when we can't create "xics".
>
> This patch adds the missing call to exit().
>
> Signed-off-by: Greg Kurz <address@hidden>
> ---
> hw/ppc/spapr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index abfb99b71b7d..f477d7b8a210 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -133,6 +133,7 @@ static void xics_system_init(MachineState *machine, int
> nr_irqs, Error **errp)
> if (machine_kernel_irqchip_required(machine) && !spapr->ics) {
> error_reportf_err(err,
> "kernel_irqchip requested but unavailable: ");
> + exit(EXIT_FAILURE);
> } else {
> error_free(err);
> }
>
This doesn't look right. We have an errp pointer in the caller. So
on failure we should error_propagate(), rather than deciding for
ourselves that exiting is the right course of action.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
[Qemu-ppc] [PATCH 3/6] spapr: fix error reporting in xics_system_init(), Greg Kurz, 2017/05/15
[Qemu-ppc] [PATCH 4/6] spapr: sanitize error handling in spapr_ics_create(), Greg Kurz, 2017/05/15