On Mon, 5 Nov 2018 11:20:35 +0100 David Hildenbrand <da...@redhat.com> wrote:
> 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_check_common(). > > Signed-off-by: David Hildenbrand <da...@redhat.com> With commit message amended per David's suggestion Reviewed-by: Igor Mammedov <imamm...@redhat.com> > --- > hw/pci/pcie.c | 17 ++++++++--------- > hw/pci/pcie_port.c | 4 ++-- > include/hw/pci/pcie.h | 8 ++++---- > 3 files changed, 14 insertions(+), 15 deletions(-) > > diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c > index 6c91bd44a0..44737cc1cd 100644 > --- a/hw/pci/pcie.c > +++ b/hw/pci/pcie.c > @@ -315,9 +315,8 @@ 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, > - uint8_t **exp_cap, Error **errp) > +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; > uint16_t sltsta = pci_get_word(*exp_cap + PCI_EXP_SLTSTA); > @@ -331,13 +330,13 @@ static void pcie_cap_slot_hotplug_common(PCIDevice > *hotplug_dev, > } > } > > -void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, > - Error **errp) > +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 > @@ -365,14 +364,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, > - DeviceState *dev, Error **errp) > +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, > diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c > index 6432b9ac1f..73e81e5847 100644 > --- a/hw/pci/pcie_port.c > +++ b/hw/pci/pcie_port.c > @@ -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 = { > diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h > index b71e369703..735f8e8154 100644 > --- a/include/hw/pci/pcie.h > +++ b/include/hw/pci/pcie.h > @@ -131,8 +131,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, > - Error **errp); > -void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, > - DeviceState *dev, Error **errp); > +void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, > + Error **errp); > +void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp); > #endif /* QEMU_PCIE_H */