From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50969 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oshsa-0001te-9Z for qemu-devel@nongnu.org; Mon, 06 Sep 2010 16:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OshsY-0003yj-OK for qemu-devel@nongnu.org; Mon, 06 Sep 2010 16:01:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60676) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OshsY-0003yc-Ho for qemu-devel@nongnu.org; Mon, 06 Sep 2010 16:01:22 -0400 Date: Mon, 6 Sep 2010 22:55:19 +0300 From: "Michael S. Tsirkin" Subject: Re: [Qemu-devel] Re: [PATCH 01/14] RESEND apb: fix typo. Message-ID: <20100906195519.GB30715@redhat.com> References: <41ea8ae52728459597ac9f5a535905ad45511343.1283759074.git.yamahata@valinux.co.jp> <20100906094600.GC13529@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: skandasa@cisco.com, etmartin@cisco.com, wexu2@cisco.com, adhyas@gmail.com, qemu-devel@nongnu.org, Isaku Yamahata On Mon, Sep 06, 2010 at 05:54:25PM +0000, Blue Swirl wrote: > On Mon, Sep 6, 2010 at 9:46 AM, Michael S. Tsirkin wro= te: > > On Mon, Sep 06, 2010 at 04:46:15PM +0900, Isaku Yamahata wrote: > >> fix typo. > >> > >> Signed-off-by: Isaku Yamahata > > > > This is separate from the express patches, right? > > I'll appply this. Thanks! >=20 > Since the patch that introduces the build breakage (pci_brdige_reset) > has not been committed to master yet, can you instead drop that commit > and introduce a fixed version? This will avoid problems with git > bisect. Sure, thanks for pointing this out. Isaku, could you just repost a fixed up patchset? Working git bisect is nice to have. > > > >> --- > >> =A0hw/apb_pci.c | =A0 =A06 +++--- > >> =A01 files changed, 3 insertions(+), 3 deletions(-) > >> > >> diff --git a/hw/apb_pci.c b/hw/apb_pci.c > >> index 10a5baa..c619112 100644 > >> --- a/hw/apb_pci.c > >> +++ b/hw/apb_pci.c > >> @@ -362,7 +362,7 @@ PCIBus *pci_apb_init(target_phys_addr_t special_= base, > >> =A0 =A0 =A0/* APB secondary busses */ > >> =A0 =A0 =A0pci_dev =3D pci_create_multifunction(d->bus, PCI_DEVFN(1,= 0), true, > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 "pbm-bridge"); > >> - =A0 =A0br =3D DO_UPCAST(PCIBridge, dev, dev); > >> + =A0 =A0br =3D DO_UPCAST(PCIBridge, dev, pci_dev); > >> =A0 =A0 =A0pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge= 1", > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pci_apb_map_irq); > >> =A0 =A0 =A0qdev_init_nofail(&pci_dev->qdev); > >> @@ -370,7 +370,7 @@ PCIBus *pci_apb_init(target_phys_addr_t special_= base, > >> > >> =A0 =A0 =A0pci_dev =3D pci_create_multifunction(d->bus, PCI_DEVFN(1,= 1), true, > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 "pbm-bridge"); > >> - =A0 =A0br =3D DO_UPCAST(PCIBridge, dev, dev); > >> + =A0 =A0br =3D DO_UPCAST(PCIBridge, dev, pci_dev); > >> =A0 =A0 =A0pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge= 2", > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pci_apb_map_irq); > >> =A0 =A0 =A0qdev_init_nofail(&pci_dev->qdev); > >> @@ -462,7 +462,7 @@ static PCIDeviceInfo pbm_pci_bridge_info =3D { > >> =A0 =A0 =A0.qdev.name =3D "pbm-bridge", > >> =A0 =A0 =A0.qdev.size =3D sizeof(PCIBridge), > >> =A0 =A0 =A0.qdev.vmsd =3D &vmstate_pci_device, > >> - =A0 =A0.qdev.reset =3D pci_brdige_reset, > >> + =A0 =A0.qdev.reset =3D pci_bridge_reset, > >> =A0 =A0 =A0.init =3D apb_pci_bridge_initfn, > >> =A0 =A0 =A0.exit =3D pci_bridge_exitfn, > >> =A0 =A0 =A0.config_write =3D pci_bridge_write_config, > >> -- > >> 1.7.1.1 > > > >