Re: [Qemu-devel] copy&paste error in serial.c causes a crash when attempting to read from UART (if there is no data to be read)

[Peter Crosthwaite]

Hi Andreas,

On Mon, Jun 17, 2013 at 10:57 AM, Andreas Färber <address@hidden> wrote:
> Am 17.06.2013 02:43, schrieb Vladimir Senkov:
>> From 032bdc94c6369aa7b578182cdad8038ebb2b8cd1 Mon Sep 17 00:00:00 2001
>> From: Vladimir Senkov <address@hidden <mailto:address@hidden>>
>> Date: Sun, 16 Jun 2013 20:30:52 -0400
>> Subject: [PATCH] fixed a copy&paste error in serial.c
>>
>> Signed-off-by: Vladimir Senkov <address@hidden <mailto:address@hidden>>
>
> Patch is HTML-damaged unfortunately, we recommend git-send-email:
> http://wiki.qemu.org/Contribute/SubmitAPatch
>
> But since the patch is so trivial, maybe Peter or Michael can fix it up?
>

Yes I can,

Sorry about the regression. I'll give Vladamir overnight to remake if
he wants, otherwise I will remake first thing tomorrow.

Regards,
Peter

> Regards,
> Andreas
>
>> ---
>>  hw/char/serial.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/char/serial.c b/hw/char/serial.c
>> index b537e42..6382f98 100644
>> --- a/hw/char/serial.c
>> +++ b/hw/char/serial.c
>> @@ -424,7 +424,7 @@ static uint64_t serial_ioport_read(void *opaque,
>> hwaddr addr, unsigned size)
>>              ret = s->divider & 0xff;
>>          } else {
>>              if(s->fcr & UART_FCR_FE) {
>> -                ret = fifo8_is_full(&s->recv_fifo) ?
>> +                ret = fifo8_is_empty(&s->recv_fifo) ?
>>                              0 : fifo8_pop(&s->recv_fifo);
>>                  if (s->recv_fifo.num == 0) {
>>                      s->lsr &= ~(UART_LSR_DR | UART_LSR_BI);
>> --
>> 1.8.1.2
>>
>
>
> --
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
>