From patchwork Tue Aug 11 21:15:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Reimar_D=C3=B6ffinger?= X-Patchwork-Id: 31169 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id BC221B6EDE for ; Wed, 12 Aug 2009 07:23:27 +1000 (EST) Received: from localhost ([127.0.0.1]:43300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MayoU-0005Sx-GB for incoming@patchwork.ozlabs.org; Tue, 11 Aug 2009 17:23:22 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mayh7-0003al-KM for qemu-devel@nongnu.org; Tue, 11 Aug 2009 17:15:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mayh2-0003aP-Ci for qemu-devel@nongnu.org; Tue, 11 Aug 2009 17:15:44 -0400 Received: from [199.232.76.173] (port=33570 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mayh2-0003aM-5H for qemu-devel@nongnu.org; Tue, 11 Aug 2009 17:15:40 -0400 Received: from mail.gmx.net ([213.165.64.20]:38238) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1Mayh1-0001vG-9Y for qemu-devel@nongnu.org; Tue, 11 Aug 2009 17:15:39 -0400 Received: (qmail invoked by alias); 11 Aug 2009 21:15:37 -0000 Received: from p5B1340BE.dip.t-dialin.net (EHLO localhost) [91.19.64.190] by mail.gmx.net (mp045) with SMTP; 11 Aug 2009 23:15:37 +0200 X-Authenticated: #11956158 X-Provags-ID: V01U2FsdGVkX18Jh5A/bAQJU+03MUsEHOcq7q6ELUJgBXClcF3RCt NbKrGGJ2lWOgcT Date: Tue, 11 Aug 2009 23:15:36 +0200 From: Reimar =?iso-8859-1?Q?D=F6ffinger?= To: qemu-devel@nongnu.org Message-ID: <20090811211536.GF10500@1und1.de> References: <4A81D3F1.1040300@codemonkey.ws> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4A81D3F1.1040300@codemonkey.ws> X-Mailer: git-send-email 1.6.4 User-Agent: Mutt/1.5.20 (2009-06-14) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.53 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH 5/5] Set the RU state to ru_no_resources instead of asserting when we used up the last receive buffer. This should not usually happen with good drivers, but it can happen with the OS X drivers at least. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently if the hardware runs out of receive buffers qemu crashes with an assert. Simply setting the RU state to "no resources" seems to work (though it is hard to provoke the situation and thus hard to test well), at least it can't be any worse than crashing due to an assert (IMO)... Signed-off-by: Reimar Döffinger --- hw/eepro100.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index d2c18cc..8b343c1 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1558,7 +1558,7 @@ static ssize_t nic_receive(VLANClientState *vc, const uint8_t * buf, size_t size s->ru_offset = le32_to_cpu(rx.link); if (rfd_command & 0x8000) { /* EL bit is set, so this was the last frame. */ - assert(0); + set_ru_state(s, ru_no_resources); } if (rfd_command & 0x4000) { /* S bit is set. */