On Sun, Jun 10, 2012 at 05:57:53PM +0200, Andreas Färber wrote: > Hello Michael, > > This series, based on a recent PReP RFC series, in turn based on Anthony's and > Wanpeng's i440fx refactoring, makes pci_host a proper QOM type and in this v2 > also updates all remaining host controllers beyond PReP. > > Only compile-tested were typhoon, bonito, ppc440 and ppce500. > I've checked it also applies cleanly to the current pci branch. > > Please review and apply. > > Intended merge plan is: > Merge this preparatory series through pci branch. > Follow up with move of struct PCIBus from pci_internals.h to pci.h (currently > typedef in qemu-common.h)
I admit pci_internals.h was a failure. We ended up using it all externally as well. So let's merge it all back into pci.h and be done with it. > once qom-next QBus refactoring is merged (qom-next-2), > merge through pci branch. > Rebase Raven PCI in-place initialization on that, merge through prep branch. > > Regards, > Andreas > > Cc: Michael S. Tsirkin <m...@redhat.com> > Cc: Anthony Liguori <anth...@codemonkey.ws> > > Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> (still no MAINTAINERS > entry!) > > Cc: Jan Kiszka <jan.kis...@siemens.com> (FYI) > > Andreas Färber (2): > pci_host: Turn into SysBus-derived QOM type > pci_host: Derive remaining PCI host controllers from TYPE_PCI_HOST > > hw/alpha_typhoon.c | 4 +- > hw/bonito.c | 73 > ++++++++++++++++++++++++++++++++-------------------- > hw/dec_pci.c | 11 ++++--- > hw/dec_pci.h | 2 + > hw/grackle_pci.c | 22 ++++++++------- > hw/gt64xxx.c | 23 +++++++++------- > hw/pci_host.c | 11 ++++++++ > hw/pci_host.h | 3 ++ > hw/piix_pci.c | 14 +++++---- > hw/ppc4xx_pci.c | 4 +- > hw/ppc_mac.h | 1 + > hw/ppc_prep.c | 4 +-- > hw/ppce500_pci.c | 7 +++-- > hw/prep_pci.c | 7 +++-- > hw/spapr_pci.c | 17 ++++++----- > hw/spapr_pci.h | 6 +++- > hw/unin_pci.c | 13 +++++---- > 17 files changed, 135 insertions(+), 87 deletions(-) > > -- > 1.7.7