david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spapr_pci: QOM cast cleanup

Browse Source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-27 16:39:37 +02:00
parent f54d31575d
commit 38fb090a80
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/ppc/spapr_pci.c
View File

@ -479,6 +479,7 @@ static AddressSpace *spapr_pci_dma_iommu(PCIBus *bus, void *opaque, int devfn)
static int spapr_phb_init(SysBusDevice *s) static int spapr_phb_init(SysBusDevice *s)
{ {
DeviceState *dev = DEVICE(s);
sPAPRPHBState *sphb = SPAPR_PCI_HOST_BRIDGE(s); sPAPRPHBState *sphb = SPAPR_PCI_HOST_BRIDGE(s);
PCIHostState *phb = PCI_HOST_BRIDGE(s); PCIHostState *phb = PCI_HOST_BRIDGE(s);
const char *busname; const char *busname;
@ -596,14 +597,14 @@ static int spapr_phb_init(SysBusDevice *s)
* since it's unique by construction, and makes the guest visible * since it's unique by construction, and makes the guest visible
* BUID clear. * BUID clear.
*/ */
if (s->qdev.id) { if (dev->id) {
busname = NULL; busname = NULL;
} else if (sphb->index == 0) { } else if (sphb->index == 0) {
busname = "pci"; busname = "pci";
} else { } else {
busname = sphb->dtbusname; busname = sphb->dtbusname;
} }
bus = pci_register_bus(DEVICE(s), busname, bus = pci_register_bus(dev, busname,
pci_spapr_set_irq, pci_spapr_map_irq, sphb, pci_spapr_set_irq, pci_spapr_map_irq, sphb,
&sphb->memspace, &sphb->iospace, &sphb->memspace, &sphb->iospace,
PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS); PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS);
@ -611,7 +612,7 @@ static int spapr_phb_init(SysBusDevice *s)
sphb->dma_window_start = 0; sphb->dma_window_start = 0;
sphb->dma_window_size = 0x40000000; sphb->dma_window_size = 0x40000000;
sphb->tcet = spapr_tce_new_table(DEVICE(sphb), sphb->dma_liobn, sphb->tcet = spapr_tce_new_table(dev, sphb->dma_liobn,
sphb->dma_window_size); sphb->dma_window_size);
if (!sphb->tcet) { if (!sphb->tcet) {
fprintf(stderr, "Unable to create TCE table for %s\n", sphb->dtbusname); fprintf(stderr, "Unable to create TCE table for %s\n", sphb->dtbusname);