[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/5] xilinx: Fix error handling
From: |
Alistair Francis |
Subject: |
Re: [Qemu-devel] [PATCH 1/5] xilinx: Fix error handling |
Date: |
Thu, 8 Jun 2017 09:29:04 -0700 |
On Thu, Jun 8, 2017 at 6:39 AM, Eduardo Habkost <address@hidden> wrote:
> Assigning directly to *errp is not valid, as errp may be NULL,
> &error_fatal, or &error_abort. Use error_propagate() instead.
>
> error_propagate() handles non-NULL *errp correctly, so the
> "if (!*errp)" check can be removed.
>
> Cc: "Edgar E. Iglesias" <address@hidden>
> Cc: Alistair Francis <address@hidden>
> Cc: Jason Wang <address@hidden>
> Cc: address@hidden
> Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Thanks,
Alistair
> ---
> hw/dma/xilinx_axidma.c | 4 +---
> hw/net/xilinx_axienet.c | 4 +---
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
> index 6065689ad1..3987b5ff96 100644
> --- a/hw/dma/xilinx_axidma.c
> +++ b/hw/dma/xilinx_axidma.c
> @@ -554,9 +554,7 @@ static void xilinx_axidma_realize(DeviceState *dev, Error
> **errp)
> return;
>
> xilinx_axidma_realize_fail:
> - if (!*errp) {
> - *errp = local_err;
> - }
> + error_propagate(errp, local_err);
> }
>
> static void xilinx_axidma_init(Object *obj)
> diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
> index b6701844d3..5ffa739f68 100644
> --- a/hw/net/xilinx_axienet.c
> +++ b/hw/net/xilinx_axienet.c
> @@ -981,9 +981,7 @@ static void xilinx_enet_realize(DeviceState *dev, Error
> **errp)
> return;
>
> xilinx_enet_realize_fail:
> - if (!*errp) {
> - *errp = local_err;
> - }
> + error_propagate(errp, local_err);
> }
>
> static void xilinx_enet_init(Object *obj)
> --
> 2.11.0.259.g40922b1
>
>
- [Qemu-devel] [PATCH 0/5] Error handling cleanup and fixes, Eduardo Habkost, 2017/06/08
- [Qemu-devel] [PATCH 1/5] xilinx: Fix error handling, Eduardo Habkost, 2017/06/08
- Re: [Qemu-devel] [PATCH 1/5] xilinx: Fix error handling,
Alistair Francis <=
- [Qemu-devel] [PATCH 3/5] websock: Don't try to set *errp directly, Eduardo Habkost, 2017/06/08
- [Qemu-devel] [PATCH 4/5] migration: Don't try to set *errp directly, Eduardo Habkost, 2017/06/08
- [Qemu-devel] [PATCH 2/5] block: Don't try to set *errp directly, Eduardo Habkost, 2017/06/08
- [Qemu-devel] [PATCH 5/5] vnc: No need for Error** parameter at vnc_client_io_error(), Eduardo Habkost, 2017/06/08