Re: [Qemu-devel] [PATCH v8 01/17] sdhci: use error_propagate(local_err) in realize()

[Alistair Francis]

On Thu, Jan 18, 2018 at 10:30 AM, Philippe Mathieu-Daudé
<address@hidden> wrote:
> avoid the "errp && *errp" pattern (not recommended in "qapi/error.h" 
> comments).
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Reviewed-by: Alistair Francis <address@hidden>

Alistair

> ---
>  hw/sd/sdhci.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
> index f9264d3be5..8c9c0fbc2a 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -1300,10 +1300,12 @@ static Property sdhci_pci_properties[] = {
>  static void sdhci_pci_realize(PCIDevice *dev, Error **errp)
>  {
>      SDHCIState *s = PCI_SDHCI(dev);
> +    Error *local_err = NULL;
>
>      sdhci_initfn(s);
>      sdhci_common_realize(s, errp);
> -    if (errp && *errp) {
> +    if (local_err) {
> +        error_propagate(errp, local_err);
>          return;
>      }
>
> @@ -1381,9 +1383,11 @@ static void sdhci_sysbus_realize(DeviceState *dev, 
> Error ** errp)
>  {
>      SDHCIState *s = SYSBUS_SDHCI(dev);
>      SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> +    Error *local_err = NULL;
>
>      sdhci_common_realize(s, errp);
> -    if (errp && *errp) {
> +    if (local_err) {
> +        error_propagate(errp, local_err);
>          return;
>      }
>
> --
> 2.15.1
>
>