From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAevS-0000cK-7e for qemu-devel@nongnu.org; Thu, 22 Mar 2012 06:07:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAevM-0006RA-2Z for qemu-devel@nongnu.org; Thu, 22 Mar 2012 06:07:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAevL-0006Qy-Qn for qemu-devel@nongnu.org; Thu, 22 Mar 2012 06:07:15 -0400 From: Jason Wang Date: Thu, 22 Mar 2012 18:02:34 +0800 Message-ID: <20120322100234.44393.86465.stgit@amd-6168-8-1.englab.nay.redhat.com> In-Reply-To: <20120322100141.44393.14528.stgit@amd-6168-8-1.englab.nay.redhat.com> References: <20120322100141.44393.14528.stgit@amd-6168-8-1.englab.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 7/7] e1000: set E1000_ICR_INT_ASSERTED only for 8257x List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, mst@redhat.com E1000_ICR_INT_ASSERTED were introduced only for 8257x, so we need to check the E1000_DEVID before setting this bit in ICS. Signed-off-by: Jason Wang --- hw/e1000.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 921f0cc..5584cc6 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -199,8 +199,10 @@ static const char phy_regcap[0x20] = { static void set_interrupt_cause(E1000State *s, int index, uint32_t val) { - if (val) + if (val && (E1000_DEVID >= E1000_DEV_ID_82547EI_MOBILE)) { + /* Only for 8257x */ val |= E1000_ICR_INT_ASSERTED; + } s->mac_reg[ICR] = val; s->mac_reg[ICS] = val; qemu_set_irq(s->dev.irq[0], (s->mac_reg[IMS] & s->mac_reg[ICR]) != 0);