From patchwork Wed Jan 26 09:45:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 80485 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 ozlabs.org (Postfix) with ESMTPS id 2ED70B70F4 for ; Wed, 26 Jan 2011 21:38:58 +1100 (EST) Received: from localhost ([127.0.0.1]:46524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi2lv-00080r-SH for incoming@patchwork.ozlabs.org; Wed, 26 Jan 2011 05:38:43 -0500 Received: from [140.186.70.92] (port=57248 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi1wZ-0005Sw-AK for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi1wP-0006nr-6o for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:39 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:43640) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi1wO-0006mt-R3 for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:29 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 07E27874C0; Wed, 26 Jan 2011 18:45:27 +0900 (JST) Received: (nullmailer pid 10187 invoked by uid 1000); Wed, 26 Jan 2011 09:45:27 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Wed, 26 Jan 2011 18:45:27 +0900 Message-Id: <426869a882ff2ab059e7c49e87862658cc29d62c.1296035044.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.1 X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp, mst@redhat.com Subject: [Qemu-devel] [PATCH] pci: w1cmask[PCI_BRIDGE_CONTROL] initialized incorrectly 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 pci_init_wmask_bridge() incorrectly set w1cmask[PCI_BRIDGE_CONTROL]. This patch removes the line otherwise the assert(!(wmask & w1cmask)) in pci_default_write_config() is hit. Signed-off-by: Isaku Yamahata --- hw/pci.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index b8f5385..79a46e7 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -643,10 +643,6 @@ static void pci_init_wmask_bridge(PCIDevice *d) PCI_BRIDGE_CTL_SEC_DISCARD | PCI_BRIDGE_CTL_DISCARD_STATUS | PCI_BRIDGE_CTL_DISCARD_SERR); - /* Below does not do anything as we never set this bit, put here for - * completeness. */ - pci_set_word(d->w1cmask + PCI_BRIDGE_CONTROL, - PCI_BRIDGE_CTL_DISCARD_STATUS); } static int pci_init_multifunction(PCIBus *bus, PCIDevice *dev)