From patchwork Mon Jun 17 07:44:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 251782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 777D02C0097 for ; Mon, 17 Jun 2013 17:45:06 +1000 (EST) Received: from localhost ([::1]:52821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoU7c-0007e9-J4 for incoming@patchwork.ozlabs.org; Mon, 17 Jun 2013 03:45:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoU79-0007Vo-Aj for qemu-devel@nongnu.org; Mon, 17 Jun 2013 03:44:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoU76-0005Tu-0V for qemu-devel@nongnu.org; Mon, 17 Jun 2013 03:44:35 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:59055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoU75-0005Tj-QU; Mon, 17 Jun 2013 03:44:31 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 27AAA418F9; Mon, 17 Jun 2013 11:44:31 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 6179C51B; Mon, 17 Jun 2013 11:44:30 +0400 (MSK) From: Michael Tokarev To: Anthony Liguori Date: Mon, 17 Jun 2013 11:44:10 +0400 Message-Id: <1371455050-9523-3-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371455050-9523-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1371455050-9523-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: Vladimir Senkov , qemu-trivial@nongnu.org, Michael Tokarev , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL trivial/urgent 2/2] fixed a copy&paste error in serial.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Vladimir Senkov Copy&paste error in serial.c causes a crash when attempting to read from UART (if there is no data to be read) Signed-off-by: Vladimir Senkov Reviewed-by: Peter Crosthwaite Signed-off-by: Michael Tokarev --- 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);