From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NeQsV-0005Om-Qz for qemu-devel@nongnu.org; Mon, 08 Feb 2010 05:30:03 -0500 Received: from [199.232.76.173] (port=36982 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NeQsU-0005OJ-C5 for qemu-devel@nongnu.org; Mon, 08 Feb 2010 05:30:02 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NeQsP-0002EM-TM for qemu-devel@nongnu.org; Mon, 08 Feb 2010 05:30:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3648) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NeQsP-0002Dq-8r for qemu-devel@nongnu.org; Mon, 08 Feb 2010 05:29:57 -0500 Date: Mon, 8 Feb 2010 12:26:42 +0200 From: "Michael S. Tsirkin" Message-ID: <20100208102642.GB14662@redhat.com> References: <20100208064503.GE22624@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100208064503.GE22624@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH] apb_pci: fix header type of pbm pci host bridge. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: Blue Swirl , qemu-devel@nongnu.org On Mon, Feb 08, 2010 at 03:45:03PM +0900, Isaku Yamahata wrote: > 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 Blue Swirl, can you Ack please? > --- > 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 Looks like apb_pci needs another sweep of getting rid of hard-coded constants. Any takers? > - d->config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type > + /* header type is initialized by do_pci_register_device() */ Let's not put such comments around code: that function can get renamed or removed or moved to another file and no one will remember to update this comment. This belongs in commit message. > 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 = { > -- > 1.6.6.1