Re: [qemu-s390x] [PATCH v3 11/25] xen: Let xencons_send() take a 'size' argument

[Marc-André Lureau]

On Wed, Feb 20, 2019 at 2:05 AM Philippe Mathieu-Daudé
<address@hidden> wrote:
>
> The single caller of xencons_send(), con_event() already use the
> difference 'con->buffer.size - con->buffer.consumed'.
> Deduplicate by passing the difference as an argument.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


Reviewed-by: Marc-André Lureau <address@hidden>


> ---
>  hw/char/xen_console.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
> index 91f34ef06c..083b2c8e2a 100644
> --- a/hw/char/xen_console.c
> +++ b/hw/char/xen_console.c
> @@ -144,11 +144,10 @@ static void xencons_receive(void *opaque, const uint8_t 
> *buf, int len)
>      xen_pv_send_notify(&con->xendev);
>  }
>
> -static void xencons_send(struct XenConsole *con)
> +static void xencons_send(struct XenConsole *con, ssize_t size)
>  {
> -    ssize_t len, size;
> +    ssize_t len;
>
> -    size = con->buffer.size - con->buffer.consumed;
>      if (qemu_chr_fe_backend_connected(&con->chr)) {
>          len = qemu_chr_fe_write(&con->chr,
>                                  con->buffer.data + con->buffer.consumed,
> @@ -280,10 +279,13 @@ static void con_disconnect(struct XenLegacyDevice 
> *xendev)
>  static void con_event(struct XenLegacyDevice *xendev)
>  {
>      struct XenConsole *con = container_of(xendev, struct XenConsole, xendev);
> +    ssize_t size;
>
>      buffer_append(con);
> -    if (con->buffer.size - con->buffer.consumed)
> -        xencons_send(con);
> +    size = con->buffer.size - con->buffer.consumed;
> +    if (size) {
> +        xencons_send(con, size);
> +    }
>  }
>
>  /* -------------------------------------------------------------------- */
> --
> 2.20.1
>