Message ID | 20181120110427.7321-4-david@redhat.com |
---|---|
State | New |
Headers | show |
Series | pci: hotplug handler reworks | expand |
On 20/11/2018 12:04, David Hildenbrand wrote: > The callbacks are also called for cold plugged devices. Drop the "hot" > to better match the actual callback names. > > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > Reviewed-by: Cornelia Huck <cohuck@redhat.com> > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > hw/s390x/s390-pci-bus.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 060ff062bc..9abd49a9dc 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -827,8 +827,8 @@ static bool s390_pci_alloc_idx(S390pciState *s, S390PCIBusDevice *pbdev) > return true; > } > > -static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev, > - DeviceState *dev, Error **errp) > +static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > + Error **errp) > { > PCIDevice *pdev = NULL; > S390PCIBusDevice *pbdev = NULL; > @@ -936,8 +936,8 @@ static void s390_pcihost_timer_cb(void *opaque) > qdev_unplug(DEVICE(pbdev), NULL); > } > > -static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev, > - DeviceState *dev, Error **errp) > +static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, > + Error **errp) > { > PCIDevice *pci_dev = NULL; > PCIBus *bus; > @@ -1045,8 +1045,8 @@ static void s390_pcihost_class_init(ObjectClass *klass, void *data) > > dc->reset = s390_pcihost_reset; > dc->realize = s390_pcihost_realize; > - hc->plug = s390_pcihost_hot_plug; > - hc->unplug = s390_pcihost_hot_unplug; > + hc->plug = s390_pcihost_plug; > + hc->unplug = s390_pcihost_unplug; > msi_nonbroken = true; > } > LBTM (does that exist? Look Better To Me) Reviewed-by: Pierre Morel<pmorel@linux.ibm.com>
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 060ff062bc..9abd49a9dc 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -827,8 +827,8 @@ static bool s390_pci_alloc_idx(S390pciState *s, S390PCIBusDevice *pbdev) return true; } -static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, + Error **errp) { PCIDevice *pdev = NULL; S390PCIBusDevice *pbdev = NULL; @@ -936,8 +936,8 @@ static void s390_pcihost_timer_cb(void *opaque) qdev_unplug(DEVICE(pbdev), NULL); } -static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, + Error **errp) { PCIDevice *pci_dev = NULL; PCIBus *bus; @@ -1045,8 +1045,8 @@ static void s390_pcihost_class_init(ObjectClass *klass, void *data) dc->reset = s390_pcihost_reset; dc->realize = s390_pcihost_realize; - hc->plug = s390_pcihost_hot_plug; - hc->unplug = s390_pcihost_hot_unplug; + hc->plug = s390_pcihost_plug; + hc->unplug = s390_pcihost_unplug; msi_nonbroken = true; }