From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoUMs-0004wJ-W0 for qemu-devel@nongnu.org; Mon, 17 Jun 2013 04:00:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoUMp-0002NV-4t for qemu-devel@nongnu.org; Mon, 17 Jun 2013 04:00:49 -0400 Message-ID: <51BEC22A.80101@suse.de> Date: Mon, 17 Jun 2013 10:00:42 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1371455050-9523-1-git-send-email-mjt@msgid.tls.msk.ru> <1371455050-9523-3-git-send-email-mjt@msgid.tls.msk.ru> In-Reply-To: <1371455050-9523-3-git-send-email-mjt@msgid.tls.msk.ru> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL trivial/urgent 2/2] fixed a copy&paste error in serial.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Tokarev Cc: Vladimir Senkov , qemu-trivial@nongnu.org, Anthony Liguori , qemu-devel@nongnu.org Am 17.06.2013 09:44, schrieb Michael Tokarev: > From: Vladimir Senkov >=20 > Copy&paste error in serial.c causes a crash when attempting > to read from UART (if there is no data to be read) >=20 > Signed-off-by: Vladimir Senkov > Reviewed-by: Peter Crosthwaite > Signed-off-by: Michael Tokarev Any chance to get the subject improved before the pull is accepted? E.g., "serial: Fix a copy&paste error" or "char/serial: ..." Andreas > --- > hw/char/serial.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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, hw= addr addr, unsigned size) > ret =3D s->divider & 0xff; > } else { > if(s->fcr & UART_FCR_FE) { > - ret =3D fifo8_is_full(&s->recv_fifo) ? > + ret =3D fifo8_is_empty(&s->recv_fifo) ? > 0 : fifo8_pop(&s->recv_fifo); > if (s->recv_fifo.num =3D=3D 0) { > s->lsr &=3D ~(UART_LSR_DR | UART_LSR_BI); >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg