From patchwork Wed Sep 21 20:06:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 115849 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 A3F8BB6F65 for ; Thu, 22 Sep 2011 06:06:41 +1000 (EST) Received: from localhost ([::1]:53320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6T41-0003cp-Da for incoming@patchwork.ozlabs.org; Wed, 21 Sep 2011 16:06:37 -0400 Received: from eggs.gnu.org ([140.186.70.92]:59999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6T3v-0003cM-GA for qemu-devel@nongnu.org; Wed, 21 Sep 2011 16:06:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6T3u-0004sp-Bq for qemu-devel@nongnu.org; Wed, 21 Sep 2011 16:06:31 -0400 Received: from complete.lackof.org ([198.49.126.79]:55890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6T3u-0004sR-4V for qemu-devel@nongnu.org; Wed, 21 Sep 2011 16:06:30 -0400 Received: from localhost (localhost [127.0.0.1]) by complete.lackof.org (Postfix) with ESMTP id DD06633E026F for ; Wed, 21 Sep 2011 14:06:26 -0600 (MDT) X-Virus-Scanned: Debian amavisd-new at lackof.org Received: from complete.lackof.org ([127.0.0.1]) by localhost (complete.lackof.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wN+8KFP52Fy7 for ; Wed, 21 Sep 2011 14:06:26 -0600 (MDT) Received: from fluid.dannf (localhost [127.0.0.1]) by complete.lackof.org (Postfix) with ESMTP id 73B4A33E0183 for ; Wed, 21 Sep 2011 14:06:26 -0600 (MDT) Received: by fluid.dannf (Postfix, from userid 1000) id 0D571A4391; Wed, 21 Sep 2011 14:06:26 -0600 (MDT) From: dann frazier To: qemu-devel@nongnu.org Date: Wed, 21 Sep 2011 14:06:25 -0600 Message-Id: <1316635586-4586-1-git-send-email-dann.frazier@canonical.com> X-Mailer: git-send-email 1.7.6.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 198.49.126.79 Subject: [Qemu-devel] [PATCH] e1000: Don't set the Capabilities List bit 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 [Originally sent to qemu-kvm list, but I was redirected here] The Capabilities Pointer is NULL, so this bit shouldn't be set. The state of this bit doesn't appear to change any behavior on Linux/Windows versions we've tested, but it does cause Windows' PCI/PCI Express Compliance Test to balk. I happen to have a physical 82540EM controller, and it also sets the Capabilities Bit, but it actually has items on the capabilities list to go with it :) Signed-off-by: dann frazier --- hw/e1000.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 6a3a941..ce8fc8b 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1151,8 +1151,6 @@ static int pci_e1000_init(PCIDevice *pci_dev) pci_conf = d->dev.config; - /* TODO: we have no capabilities, so why is this bit set? */ - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST); /* TODO: RST# value should be 0, PCI spec 6.2.4 */ pci_conf[PCI_CACHE_LINE_SIZE] = 0x10;