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

[Paul Durrant]

> -----Original Message-----
> From: Philippe Mathieu-Daudé [mailto:address@hidden
> Sent: 20 February 2019 01:02
> To: address@hidden; Prasad J Pandit <address@hidden>; Marc-
> André Lureau <address@hidden>; Paolo Bonzini
> <address@hidden>
> Cc: Jason Wang <address@hidden>; Anthony Perard
> <address@hidden>; address@hidden; Stefan Berger
> <address@hidden>; David Gibson <address@hidden>; Gerd
> Hoffmann <address@hidden>; Zhang Chen <address@hidden>; xen-
> address@hidden; Cornelia Huck <address@hidden>; Samuel
> Thibault <address@hidden>; Christian Borntraeger
> <address@hidden>; Amit Shah <address@hidden>; Li Zhijian
> <address@hidden>; Corey Minyard <address@hidden>; Michael S.
> Tsirkin <address@hidden>; Paul Durrant <address@hidden>; Halil
> Pasic <address@hidden>; Stefano Stabellini <address@hidden>;
> address@hidden; Pavel Dovgalyuk <address@hidden>;
> Philippe Mathieu-Daudé <address@hidden>
> Subject: [PATCH v3 11/25] xen: Let xencons_send() take a 'size' argument
> 
> 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>
> ---
>  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);
> +    }

You introduce this here, only to modify it in patch #12. Why not squash the two 
together?

  Paul

>  }
> 
>  /* --------------------------------------------------------------------
> */
> --
> 2.20.1