From patchwork Mon Jun 17 00:43:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Senkov X-Patchwork-Id: 251753 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 C73852C007B for ; Mon, 17 Jun 2013 10:43:28 +1000 (EST) Received: from localhost ([::1]:46214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoNXX-00031F-RG for incoming@patchwork.ozlabs.org; Sun, 16 Jun 2013 20:43:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55607) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoNXH-00031A-P5 for qemu-devel@nongnu.org; Sun, 16 Jun 2013 20:43:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoNXF-0003Ac-Bp for qemu-devel@nongnu.org; Sun, 16 Jun 2013 20:43:07 -0400 Received: from mail-qc0-x233.google.com ([2607:f8b0:400d:c01::233]:43896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoNXF-0003AW-7S for qemu-devel@nongnu.org; Sun, 16 Jun 2013 20:43:05 -0400 Received: by mail-qc0-f179.google.com with SMTP id e11so1279800qcx.38 for ; Sun, 16 Jun 2013 17:43:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=2+3NnOT4gtrubO3urPBgnAF0/ck0VpzT+w2GNqm9NYw=; b=pi6dRZ8PBHH+5ltGwN4XSxQ7jdBxxRP4R8pVdkmK8naoGK/jv9MX5kAVxxzj9QLYeO Qszlt2We2OTUw8UzNUYj4xtt6zQ8ZtNrdb0Ahi25plW3iBJmo0fpjk3atOQw1kgpuum6 aULlr7BQ4Cx8bk8fPJLBT61vqZqQnejShpH3f0tZheyhF7XwaDi1BOaTDvu7Kyp/QRwg 0YE+p+kDJg3eAGMOUecrGwNTlDaiuG5lK088SpykEe1oCXs7MH+QOdtAeg0b+PJ2yliu JpZnzd8An1ijgs78VPsZvUtM4ajeFF28OEXwR5wIyeCupJ5owM2esGChZ/iygzchiBML r8UA== MIME-Version: 1.0 X-Received: by 10.229.69.6 with SMTP id x6mr5532371qci.152.1371429784057; Sun, 16 Jun 2013 17:43:04 -0700 (PDT) Received: by 10.49.104.3 with HTTP; Sun, 16 Jun 2013 17:43:03 -0700 (PDT) Date: Sun, 16 Jun 2013 20:43:03 -0400 Message-ID: From: Vladimir Senkov To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::233 Subject: [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) 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 032bdc94c6369aa7b578182cdad8038ebb2b8cd1 Mon Sep 17 00:00:00 2001 From: Vladimir Senkov Date: Sun, 16 Jun 2013 20:30:52 -0400 Subject: [PATCH] fixed a copy&paste error in serial.c Signed-off-by: Vladimir Senkov Reviewed-by: Peter Crosthwaite --- hw/char/serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) s->lsr &= ~(UART_LSR_DR | UART_LSR_BI); -- 1.8.1.2 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) {