Commit c6ba42f6 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Andreas Färber
Browse files

spapr-pci: Convert to QOM realize 



This converts the old-style SysBusDevice::init() callback to a new-style
DeviceClass::realize() callback.

As a part of conversion, this replaces fprintf(stderr) with error_setg()
as realize() does not "return" any value, instead it puts the extended
error into **errp.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarMike Day <ncmike@ncultra.org>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent fb0e843a

hw/ppc/spapr_pci.c

+21 −22
Original line number Diff line number Diff line
@@ -505,9 +505,9 @@ static AddressSpace *spapr_pci_dma_iommu(PCIBus *bus, void *opaque, int devfn) 
    return &phb->iommu_as;

}



static int spapr_phb_init(SysBusDevice *s)

static void spapr_phb_realize(DeviceState *dev, Error **errp)

{

    DeviceState *dev = DEVICE(s);

    SysBusDevice *s = SYS_BUS_DEVICE(dev);

    sPAPRPHBState *sphb = SPAPR_PCI_HOST_BRIDGE(s);

    PCIHostState *phb = PCI_HOST_BRIDGE(s);

    const char *busname;
@@ -521,9 +521,9 @@ static int spapr_phb_init(SysBusDevice *s) 
        if ((sphb->buid != -1) || (sphb->dma_liobn != -1)

            || (sphb->mem_win_addr != -1)

            || (sphb->io_win_addr != -1)) {

            fprintf(stderr, "Either \"index\" or other parameters must"

                    " be specified for PAPR PHB, not both\n");

            return -1;

            error_setg(errp, "Either \"index\" or other parameters must"

                       " be specified for PAPR PHB, not both");

            return;

        }



        sphb->buid = SPAPR_PCI_BASE_BUID + sphb->index;
@@ -536,28 +536,28 @@ static int spapr_phb_init(SysBusDevice *s) 
    }



    if (sphb->buid == -1) {

        fprintf(stderr, "BUID not specified for PHB\n");

        return -1;

        error_setg(errp, "BUID not specified for PHB");

        return;

    }



    if (sphb->dma_liobn == -1) {

        fprintf(stderr, "LIOBN not specified for PHB\n");

        return -1;

        error_setg(errp, "LIOBN not specified for PHB");

        return;

    }



    if (sphb->mem_win_addr == -1) {

        fprintf(stderr, "Memory window address not specified for PHB\n");

        return -1;

        error_setg(errp, "Memory window address not specified for PHB");

        return;

    }



    if (sphb->io_win_addr == -1) {

        fprintf(stderr, "IO window address not specified for PHB\n");

        return -1;

        error_setg(errp, "IO window address not specified for PHB");

        return;

    }



    if (find_phb(spapr, sphb->buid)) {

        fprintf(stderr, "PCI host bridges must have unique BUIDs\n");

        return -1;

        error_setg(errp, "PCI host bridges must have unique BUIDs");

        return;

    }



    sphb->dtbusname = g_strdup_printf("pci@%" PRIx64, sphb->buid);
@@ -624,8 +624,9 @@ static int spapr_phb_init(SysBusDevice *s) 
    sphb->tcet = spapr_tce_new_table(dev, sphb->dma_liobn,

                                     sphb->dma_window_size);

    if (!sphb->tcet) {

        fprintf(stderr, "Unable to create TCE table for %s\n", sphb->dtbusname);

        return -1;

        error_setg(errp, "Unable to create TCE table for %s",

                   sphb->dtbusname);

        return;

    }

    address_space_init(&sphb->iommu_as, spapr_tce_get_iommu(sphb->tcet),

                       sphb->dtbusname);
@@ -642,13 +643,12 @@ static int spapr_phb_init(SysBusDevice *s) 


        irq = spapr_allocate_lsi(0);

        if (!irq) {

            return -1;

            error_setg(errp, "spapr_allocate_lsi failed");

            return;

        }



        sphb->lsi_table[i].irq = irq;

    }



    return 0;

}



static void spapr_phb_reset(DeviceState *qdev)
@@ -731,11 +731,10 @@ static const char *spapr_phb_root_bus_path(PCIHostState *host_bridge, 
static void spapr_phb_class_init(ObjectClass *klass, void *data)

{

    PCIHostBridgeClass *hc = PCI_HOST_BRIDGE_CLASS(klass);

    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);

    DeviceClass *dc = DEVICE_CLASS(klass);



    hc->root_bus_path = spapr_phb_root_bus_path;

    sdc->init = spapr_phb_init;

    dc->realize = spapr_phb_realize;

    dc->props = spapr_phb_properties;

    dc->reset = spapr_phb_reset;

    dc->vmsd = &vmstate_spapr_pci;