Commit 6304fd27 authored by David Gibson's avatar David Gibson
Browse files

spapr: Fold spapr_phb_{add,remove}_pci_device() into their only callers



Both functions are fairly short, and so are their callers.  There's no
particular logical distinction between them, so fold them together.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Acked-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 0be4e886
Loading
Loading
Loading
Loading
+23 −40
Original line number Diff line number Diff line
@@ -1344,30 +1344,6 @@ static int spapr_create_pci_child_dt(sPAPRPHBState *phb, PCIDevice *dev,
    return offset;
}

static void spapr_phb_add_pci_device(sPAPRDRConnector *drc,
                                     sPAPRPHBState *phb,
                                     PCIDevice *pdev,
                                     Error **errp)
{
    DeviceState *dev = DEVICE(pdev);
    void *fdt = NULL;
    int fdt_start_offset = 0, fdt_size;

    fdt = create_device_tree(&fdt_size);
    fdt_start_offset = spapr_create_pci_child_dt(phb, pdev, fdt, 0);
    if (!fdt_start_offset) {
        error_setg(errp, "Failed to create pci child device tree node");
        goto out;
    }

    spapr_drc_attach(drc, DEVICE(pdev),
                     fdt, fdt_start_offset, !dev->hotplugged, errp);
out:
    if (*errp) {
        g_free(fdt);
    }
}

/* Callback to be called during DRC release. */
void spapr_phb_remove_pci_device_cb(DeviceState *dev)
{
@@ -1385,14 +1361,6 @@ void spapr_phb_remove_pci_device_cb(DeviceState *dev)
    object_unparent(OBJECT(dev));
}

static void spapr_phb_remove_pci_device(sPAPRDRConnector *drc,
                                        sPAPRPHBState *phb,
                                        PCIDevice *pdev,
                                        Error **errp)
{
    spapr_drc_detach(drc, DEVICE(pdev), errp);
}

static sPAPRDRConnector *spapr_phb_get_pci_func_drc(sPAPRPHBState *phb,
                                                    uint32_t busnr,
                                                    int32_t devfn)
@@ -1429,6 +1397,8 @@ static void spapr_phb_hot_plug_child(HotplugHandler *plug_handler,
    Error *local_err = NULL;
    PCIBus *bus = PCI_BUS(qdev_get_parent_bus(DEVICE(pdev)));
    uint32_t slotnr = PCI_SLOT(pdev->devfn);
    void *fdt = NULL;
    int fdt_start_offset, fdt_size;

    /* if DR is disabled we don't need to do anything in the case of
     * hotplug or coldplug callbacks
@@ -1438,10 +1408,10 @@ static void spapr_phb_hot_plug_child(HotplugHandler *plug_handler,
         * we need to let them know it's not enabled
         */
        if (plugged_dev->hotplugged) {
            error_setg(errp, QERR_BUS_NO_HOTPLUG,
            error_setg(&local_err, QERR_BUS_NO_HOTPLUG,
                       object_get_typename(OBJECT(phb)));
        }
        return;
        goto out;
    }

    g_assert(drc);
@@ -1452,16 +1422,23 @@ static void spapr_phb_hot_plug_child(HotplugHandler *plug_handler,
     */
    if (plugged_dev->hotplugged && bus->devices[PCI_DEVFN(slotnr, 0)] &&
        PCI_FUNC(pdev->devfn) != 0) {
        error_setg(errp, "PCI: slot %d function 0 already ocuppied by %s,"
        error_setg(&local_err, "PCI: slot %d function 0 already ocuppied by %s,"
                   " additional functions can no longer be exposed to guest.",
                   slotnr, bus->devices[PCI_DEVFN(slotnr, 0)]->name);
        return;
        goto out;
    }

    fdt = create_device_tree(&fdt_size);
    fdt_start_offset = spapr_create_pci_child_dt(phb, pdev, fdt, 0);
    if (!fdt_start_offset) {
        error_setg(&local_err, "Failed to create pci child device tree node");
        goto out;
    }

    spapr_phb_add_pci_device(drc, phb, pdev, &local_err);
    spapr_drc_attach(drc, DEVICE(pdev), fdt, fdt_start_offset,
                     !plugged_dev->hotplugged, &local_err);
    if (local_err) {
        error_propagate(errp, local_err);
        return;
        goto out;
    }

    /* If this is function 0, signal hotplug for all the device functions.
@@ -1485,6 +1462,12 @@ static void spapr_phb_hot_plug_child(HotplugHandler *plug_handler,
            }
        }
    }

out:
    if (local_err) {
        error_propagate(errp, local_err);
        g_free(fdt);
    }
}

static void spapr_phb_hot_unplug_child(HotplugHandler *plug_handler,
@@ -1531,7 +1514,7 @@ static void spapr_phb_hot_unplug_child(HotplugHandler *plug_handler,
            }
        }

        spapr_phb_remove_pci_device(drc, phb, pdev, &local_err);
        spapr_drc_detach(drc, DEVICE(pdev), &local_err);
        if (local_err) {
            error_propagate(errp, local_err);
            return;