On Thu, Jun 8, 2017 at 6:39 AM, Eduardo Habkost <ehabk...@redhat.com> 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" <edgar.igles...@gmail.com>
> Cc: Alistair Francis <alistair.fran...@xilinx.com>
> Cc: Jason Wang <jasow...@redhat.com>
> Cc: qemu-...@nongnu.org
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
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
>
>
