Am 15.08.2012 11:58, schrieb Alexander Graf:
> From: Alexey Kardashevskiy <a...@ozlabs.ru>
>
> The PCIHostState struct already contains SysBusDevice so
> the one in sPAPRPHBState has to go.
>
> Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru>
> Signed-off-by: Alexander Graf <ag...@suse.de>
As mentioned, this patch conflicts with my spapr_pci patch in the
pci_host series that Anthony wanted to apply for 1.2.
Andreas
> ---
> hw/spapr_pci.c | 4 ++--
> hw/spapr_pci.h | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
> index b2e4f78..5bee180 100644
> --- a/hw/spapr_pci.c
> +++ b/hw/spapr_pci.c
> @@ -276,7 +276,7 @@ static DMAContext *spapr_pci_dma_context_fn(PCIBus *bus,
> void *opaque,
>
> static int spapr_phb_init(SysBusDevice *s)
> {
> - sPAPRPHBState *phb = FROM_SYSBUS(sPAPRPHBState, s);
> + sPAPRPHBState *phb = DO_UPCAST(sPAPRPHBState, host_state.busdev, s);
> char *namebuf;
> int i;
> PCIBus *bus;
> @@ -314,7 +314,7 @@ static int spapr_phb_init(SysBusDevice *s)
> memory_region_add_subregion(get_system_memory(), phb->io_win_addr,
> &phb->iowindow);
>
> - bus = pci_register_bus(&phb->busdev.qdev,
> + bus = pci_register_bus(&phb->host_state.busdev.qdev,
> phb->busname ? phb->busname : phb->dtbusname,
> pci_spapr_set_irq, pci_spapr_map_irq, phb,
> &phb->memspace, &phb->iospace,
> diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h
> index d9e46e2..a141764 100644
> --- a/hw/spapr_pci.h
> +++ b/hw/spapr_pci.h
> @@ -28,7 +28,6 @@
> #include "hw/xics.h"
>
> typedef struct sPAPRPHBState {
> - SysBusDevice busdev;
> PCIHostState host_state;
>
> uint64_t buid;
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
