On Mon, Nov 05, 2018 at 11:20:37AM +0100, David Hildenbrand wrote: > The callbacks are also called for cold plugged devices. Drop the "hot" > to better match the actual callback names. > > Signed-off-by: David Hildenbrand <da...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au> > --- > 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 e42e1b80d6..e1b14b131b 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -813,8 +813,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; > @@ -923,8 +923,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; > @@ -1032,8 +1032,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; > } > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature