From patchwork Mon Feb 8 06:45:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 44763 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 C6864B7D10 for ; Mon, 8 Feb 2010 17:52:59 +1100 (EST) Received: from localhost ([127.0.0.1]:43545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NeNPx-0006R6-Jg for incoming@patchwork.ozlabs.org; Mon, 08 Feb 2010 01:48:21 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NeNMK-00061J-2K for qemu-devel@nongnu.org; Mon, 08 Feb 2010 01:44:36 -0500 Received: from [199.232.76.173] (port=40976 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NeNMJ-00060p-2A for qemu-devel@nongnu.org; Mon, 08 Feb 2010 01:44:35 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NeNMD-0001gP-OQ for qemu-devel@nongnu.org; Mon, 08 Feb 2010 01:44:34 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:52010) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NeNMD-0001gL-B8 for qemu-devel@nongnu.org; Mon, 08 Feb 2010 01:44: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 2127E48A0F; Mon, 8 Feb 2010 15:44:28 +0900 (JST) Received: (nullmailer pid 28613 invoked by uid 1000); Mon, 08 Feb 2010 06:45:03 -0000 Date: Mon, 8 Feb 2010 15:45:03 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org Message-ID: <20100208064503.GE22624@valinux.co.jp> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Blue Swirl , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH] apb_pci: fix header type of pbm pci host bridge. 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 The change set of 776e1bbb6cf4fe66a93c1a5dd814bbb650deca00 specifies pbm pci host bridge is type of bridge. It contradicts with pbm_pci_host_init(). Blue Swirl, could you please check this patch? To be honest I don't know about pbm pci host bridge so that I don't know which is correct, pbm_pci_host_init() or pbm_pci_host_info. I just took the older code. Cc: Blue Swirl Cc: "Michael S. Tsirkin" Signed-off-by: Isaku Yamahata --- hw/apb_pci.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 46d5b0e..359a84f 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -471,7 +471,7 @@ static int pbm_pci_host_init(PCIDevice *d) d->config[0x09] = 0x00; // programming i/f pci_config_set_class(d->config, PCI_CLASS_BRIDGE_HOST); d->config[0x0D] = 0x10; // latency_timer - d->config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type + /* header type is initialized by do_pci_register_device() */ return 0; } @@ -479,7 +479,6 @@ static PCIDeviceInfo pbm_pci_host_info = { .qdev.name = "pbm", .qdev.size = sizeof(PCIDevice), .init = pbm_pci_host_init, - .header_type = PCI_HEADER_TYPE_BRIDGE, }; static SysBusDeviceInfo pbm_host_info = {