From patchwork Tue Jan 8 10:45:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 210335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A10B82C0084 for ; Tue, 8 Jan 2013 21:46:42 +1100 (EST) Received: from localhost ([::1]:52102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsWhc-0001ZD-Pr for incoming@patchwork.ozlabs.org; Tue, 08 Jan 2013 05:46:40 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsWgt-0008Qq-Ka for qemu-devel@nongnu.org; Tue, 08 Jan 2013 05:45:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsWgq-0006cN-7b for qemu-devel@nongnu.org; Tue, 08 Jan 2013 05:45:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsWgp-0006cI-RU for qemu-devel@nongnu.org; Tue, 08 Jan 2013 05:45:52 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r08Ajpr4012301 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 8 Jan 2013 05:45:51 -0500 Received: from localhost (ovpn-112-29.ams2.redhat.com [10.36.112.29]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r08AjnYE014270; Tue, 8 Jan 2013 05:45:50 -0500 From: Stefan Hajnoczi To: Date: Tue, 8 Jan 2013 11:45:39 +0100 Message-Id: <1357641939-20030-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1357641939-20030-1-git-send-email-stefanha@redhat.com> References: <1357641939-20030-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Amos Kong , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 4/4] rtl8139: preserve link state across device reset 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: Amos Kong A device reset does not affect the link state, only set_link does. Signed-off-by: Amos Kong Signed-off-by: Stefan Hajnoczi --- hw/rtl8139.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/rtl8139.c b/hw/rtl8139.c index c59ec6b..3e08062 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -1258,7 +1258,8 @@ static void rtl8139_reset(DeviceState *d) s->BasicModeStatus = 0x7809; //s->BasicModeStatus |= 0x0040; /* UTP medium */ s->BasicModeStatus |= 0x0020; /* autonegotiation completed */ - s->BasicModeStatus |= 0x0004; /* link is up */ + /* preserve link state */ + s->BasicModeStatus |= s->nic->nc.link_down ? 0 : 0x04; s->NWayAdvert = 0x05e1; /* all modes, full duplex */ s->NWayLPAR = 0x05e1; /* all modes, full duplex */