Commit 5571727a authored by David Hildenbrand's avatar David Hildenbrand Committed by Michael S. Tsirkin
Browse files

pci/pcie: rename hotplug handler callbacks 



The callbacks are also called for cold plugged devices. Drop the "hot"
to better match the actual callback names.

While at it, also rename  pcie_cap_slot_hotplug_common() to
pcie_cap_slot_plug_common().

Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent cc425b5d

hw/pci/pcie.c

+8 −9
Original line number Diff line number Diff line
@@ -390,8 +390,7 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event) 
    hotplug_event_notify(dev);

}



static void pcie_cap_slot_hotplug_common(PCIDevice *hotplug_dev,

                                         DeviceState *dev,

static void pcie_cap_slot_plug_common(PCIDevice *hotplug_dev, DeviceState *dev,

                                      uint8_t **exp_cap, Error **errp)

{

    *exp_cap = hotplug_dev->config + hotplug_dev->exp.exp_cap;
@@ -406,13 +405,13 @@ static void pcie_cap_slot_hotplug_common(PCIDevice *hotplug_dev, 
    }

}



void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,

void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,

                           Error **errp)

{

    uint8_t *exp_cap;

    PCIDevice *pci_dev = PCI_DEVICE(dev);



    pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp);

    pcie_cap_slot_plug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp);



    /* Don't send event when device is enabled during qemu machine creation:

     * it is present on boot, no hotplug event is necessary. We do send an
@@ -448,14 +447,14 @@ static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque) 
    object_unparent(OBJECT(dev));

}



void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev,

void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,

                                     DeviceState *dev, Error **errp)

{

    uint8_t *exp_cap;

    PCIDevice *pci_dev = PCI_DEVICE(dev);

    PCIBus *bus = pci_get_bus(pci_dev);



    pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp);

    pcie_cap_slot_plug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp);



    /* In case user cancel the operation of multi-function hot-add,

     * remove the function that is unexposed to guest individually,

hw/pci/pcie_port.c

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ static void pcie_slot_class_init(ObjectClass *oc, void *data) 
    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);



    dc->props = pcie_slot_props;

    hc->plug = pcie_cap_slot_hotplug_cb;

    hc->unplug_request = pcie_cap_slot_hot_unplug_request_cb;

    hc->plug = pcie_cap_slot_plug_cb;

    hc->unplug_request = pcie_cap_slot_unplug_request_cb;

}



static const TypeInfo pcie_slot_type_info = {

include/hw/pci/pcie.h

+4 −4
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn); 
void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_num);

void pcie_ats_init(PCIDevice *dev, uint16_t offset);



void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,

void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,

                           Error **errp);

void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev,

void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,

                                     DeviceState *dev, Error **errp);

#endif /* QEMU_PCIE_H */