diff options
| author |   Alexey Kardashevskiy <aik@ozlabs.ru> | 2012-06-13 18:38:50 +0000 |
|---|---|---|
| committer |   Alexander Graf <agraf@suse.de> | 2012-08-15 19:43:13 +0200 |
| commit | 231903bf27c18ba6d4d905601eab368f324159eb (patch) | |
| tree | 09925869ba87b85e26ed8d5e7ea66da5d7d96176 | |
| parent | 03834e22abafbc8dc4052d46a5ccd6dd135a54a3 (diff) | |
pseries pci: removed redundant busdev
The PCIHostState struct already contains SysBusDevice so
the one in sPAPRPHBState has to go.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/spapr_pci.c | 4 | ||||
| -rw-r--r-- | 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 b2e4f785e..5bee18098 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 d9e46e22e..a141764a6 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; |