From patchwork Thu Jun 14 04:38:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: pseries pci: removed redundand busdev Date: Wed, 13 Jun 2012 18:38:50 -0000 From: Alexey Kardashevskiy X-Patchwork-Id: 164803 Message-Id: <4FD96ADA.9070208@ozlabs.ru> To: kvm-ppc@vger.kernel.org, "qemu-devel@nongnu.org" , Benjamin Herrenschmidt The PCIHostState struct already contains SysBusDevice so the one in sPAPRPHBState has to go. Signed-off-by: Alexey Kardashevskiy --- 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 75943cf..1c0b605 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -215,7 +215,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; @@ -253,7 +253,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;