On (Thu) 28 Mar 2013 [14:28:11], Hans de Goede wrote:
> This is necessary so that we get properly woken up to write the rest.
>
> Signed-off-by: Hans de Goede <hdego...@redhat.com>
> Acked-by: Amit Shah <amit.s...@redhat.com>
> ---
> hw/virtio-console.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/virtio-console.c b/hw/virtio-console.c
> index 284180f..015947c 100644
> --- a/hw/virtio-console.c
> +++ b/hw/virtio-console.c
> @@ -47,7 +47,7 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const
> uint8_t *buf, size_t len)
> ret = qemu_chr_fe_write(vcon->chr, buf, len);
> trace_virtio_console_flush_buf(port->id, len, ret);
>
> - if (ret <= 0) {
> + if (ret < len) {
Oops, there's a conversion bug here: len is size_t, and ret is
ssize_t. Both need to be the same type.
Since we're not returning negative, ret should be changed to size_t.
The function signature changes too, but that's alright.
> VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port);
>
> /*
> @@ -56,7 +56,8 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const
> uint8_t *buf, size_t len)
> * we had a finer-grained message, like -EPIPE, we could close
> * this connection.
> */
> - ret = 0;
> + if (ret < 0)
> + ret = 0;
And there need to be braces here.
Amit
