ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexey Kardashevskiy 2012-06-13 18:38:50 +00:00 committed by Alexander Graf
parent 03834e22ab
commit 231903bf27
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/spapr_pci.c
View File

@ -276,7 +276,7 @@ static DMAContext *spapr_pci_dma_context_fn(PCIBus *bus, void *opaque,
static int spapr_phb_init(SysBusDevice *s) static int spapr_phb_init(SysBusDevice *s)
{ {
sPAPRPHBState *phb = FROM_SYSBUS(sPAPRPHBState, s); sPAPRPHBState *phb = DO_UPCAST(sPAPRPHBState, host_state.busdev, s);
char *namebuf; char *namebuf;
int i; int i;
PCIBus *bus; PCIBus *bus;
@ -314,7 +314,7 @@ static int spapr_phb_init(SysBusDevice *s)
memory_region_add_subregion(get_system_memory(), phb->io_win_addr, memory_region_add_subregion(get_system_memory(), phb->io_win_addr,
&phb->iowindow); &phb->iowindow);
bus = pci_register_bus(&phb->busdev.qdev, bus = pci_register_bus(&phb->host_state.busdev.qdev,
phb->busname ? phb->busname : phb->dtbusname, phb->busname ? phb->busname : phb->dtbusname,
pci_spapr_set_irq, pci_spapr_map_irq, phb, pci_spapr_set_irq, pci_spapr_map_irq, phb,
&phb->memspace, &phb->iospace, &phb->memspace, &phb->iospace,

1
hw/spapr_pci.h
View File

@ -28,7 +28,6 @@
#include "hw/xics.h" #include "hw/xics.h"
typedef struct sPAPRPHBState { typedef struct sPAPRPHBState {
SysBusDevice busdev;
PCIHostState host_state; PCIHostState host_state;
uint64_t buid; uint64_t buid;