Re: [Qemu-devel] [PATCH 3/5] websock: Don't try to set *errp directly

[Markus Armbruster]

Eduardo Habkost <address@hidden> writes:

> Assigning directly to *errp is not valid, as errp may be NULL,
> &error_fatal, or &error_abort.  Use error_propagate() instead.
>
> Cc: "Daniel P. Berrange" <address@hidden>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
>  io/channel-websock.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/io/channel-websock.c b/io/channel-websock.c
> index 8fabadea2f..5a3badbec2 100644
> --- a/io/channel-websock.c
> +++ b/io/channel-websock.c
> @@ -856,7 +856,7 @@ static ssize_t qio_channel_websock_readv(QIOChannel *ioc,
>      ssize_t ret;
>  
>      if (wioc->io_err) {
> -        *errp = error_copy(wioc->io_err);
> +        error_propagate(errp, error_copy(wioc->io_err));
>          return -1;
>      }
>  
> @@ -902,7 +902,7 @@ static ssize_t qio_channel_websock_writev(QIOChannel *ioc,
>      ssize_t ret;
>  
>      if (wioc->io_err) {
> -        *errp = error_copy(wioc->io_err);
> +        error_propagate(errp, error_copy(wioc->io_err));
>          return -1;
>      }

The error_copy() is wasted when !errp.  Good enough for an error path.
Same for PATCH 2.

Reviewed-by: Markus Armbruster <address@hidden>