From patchwork Fri Jan 27 07:27:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 138189 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 681C4B6EF2 for ; Fri, 27 Jan 2012 18:28:55 +1100 (EST) Received: from localhost ([::1]:49166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqgEt-0006Rd-RB for incoming@patchwork.ozlabs.org; Fri, 27 Jan 2012 02:28:51 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqgEb-0006B1-8U for qemu-devel@nongnu.org; Fri, 27 Jan 2012 02:28:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqgEZ-0008Ta-Nq for qemu-devel@nongnu.org; Fri, 27 Jan 2012 02:28:33 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:51633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqgEZ-0008TR-Bg for qemu-devel@nongnu.org; Fri, 27 Jan 2012 02:28:31 -0500 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 27 Jan 2012 07:28:30 -0000 Received: from d06nrmr1407.portsmouth.uk.ibm.com (9.149.38.185) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 27 Jan 2012 07:28:29 -0000 Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0R7STl52470004 for ; Fri, 27 Jan 2012 07:28:29 GMT Received: from d06av07.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0R7SSRf003611 for ; Fri, 27 Jan 2012 00:28:28 -0700 Received: from localhost (sig-9-146-169-64.uk.ibm.com [9.146.169.64]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q0R7SQtC003572; Fri, 27 Jan 2012 00:28:27 -0700 From: Stefan Hajnoczi To: Anthony Liguori Date: Fri, 27 Jan 2012 07:27:59 +0000 Message-Id: <1327649282-12431-4-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1327649282-12431-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1327649282-12431-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12012707-4966-0000-0000-00000148BEF6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.106 Cc: Jan Kiszka , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 3/6] e1000: 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: Jan Kiszka A device reset does not affect the link state, only set_link does. Signed-off-by: Jan Kiszka Signed-off-by: Stefan Hajnoczi --- hw/e1000.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 86c5416..76e736f 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1133,6 +1133,11 @@ static void e1000_reset(void *opaque) memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init); d->rxbuf_min_shift = 1; memset(&d->tx, 0, sizeof d->tx); + + if (d->nic->nc.link_down) { + d->mac_reg[STATUS] &= ~E1000_STATUS_LU; + d->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS; + } } static NetClientInfo net_e1000_info = {