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 <m...@redhat.com> wrote:
> > On Mon, Sep 06, 2010 at 04:46:15PM +0900, Isaku Yamahata wrote:
> >> fix typo.
> >>
> >> Signed-off-by: Isaku Yamahata <yamah...@valinux.co.jp>
> >
> > This is separate from the express patches, right?
> > I'll appply this. Thanks!
>
> 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.
> >
> >> ---
> >> hw/apb_pci.c | 6 +++---
> >> 1 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,
> >> /* APB secondary busses */
> >> pci_dev = pci_create_multifunction(d->bus, PCI_DEVFN(1, 0), true,
> >> "pbm-bridge");
> >> - br = DO_UPCAST(PCIBridge, dev, dev);
> >> + br = DO_UPCAST(PCIBridge, dev, pci_dev);
> >> pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge 1",
> >> pci_apb_map_irq);
> >> qdev_init_nofail(&pci_dev->qdev);
> >> @@ -370,7 +370,7 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base,
> >>
> >> pci_dev = pci_create_multifunction(d->bus, PCI_DEVFN(1, 1), true,
> >> "pbm-bridge");
> >> - br = DO_UPCAST(PCIBridge, dev, dev);
> >> + br = DO_UPCAST(PCIBridge, dev, pci_dev);
> >> pci_bridge_map_irq(br, "Advanced PCI Bus secondary bridge 2",
> >> pci_apb_map_irq);
> >> qdev_init_nofail(&pci_dev->qdev);
> >> @@ -462,7 +462,7 @@ static PCIDeviceInfo pbm_pci_bridge_info = {
> >> .qdev.name = "pbm-bridge",
> >> .qdev.size = sizeof(PCIBridge),
> >> .qdev.vmsd = &vmstate_pci_device,
> >> - .qdev.reset = pci_brdige_reset,
> >> + .qdev.reset = pci_bridge_reset,
> >> .init = apb_pci_bridge_initfn,
> >> .exit = pci_bridge_exitfn,
> >> .config_write = pci_bridge_write_config,
> >> --
> >> 1.7.1.1
> >
> >
