On Wed, Aug 21, 2019 at 06:33:32PM +0200, Damien Hedde wrote: > Provide a temporary device_legacy_reset function doing what > device_reset does to prepare for the transition with Resettable > API. > > All occurrence of device_reset in the code tree are also replaced > by device_legacy_reset. > > The new resettable API has different prototype and semantics > (resetting child buses as well as the specified device). Subsequent > commits will make the changeover for each call site individually; once > that is complete device_legacy_reset() will be removed. > > Signed-off-by: Damien Hedde > Reviewed-by: Peter Maydell ppc parts Acked-by: David Gibson > --- > Cc: Gerd Hoffmann > Cc: Paolo Bonzini > Cc: "Daniel P. Berrangé" > Cc: Eduardo Habkost > Cc: Richard Henderson > Cc: "Michael S. Tsirkin" > Cc: Marcel Apfelbaum > Cc: John Snow > Cc: "Cédric Le Goater" > Cc: Collin Walling > Cc: Cornelia Huck > Cc: David Hildenbrand > Cc: Halil Pasic > Cc: Christian Borntraeger > Cc: Dmitry Fleytman > Cc: Fam Zheng > Cc: qemu-block@nongnu.org > Cc: qemu-ppc@nongnu.org > Cc: qemu-s390x@nongnu.org > Cc: qemu-arm@nongnu.org > --- > hw/audio/intel-hda.c | 2 +- > hw/core/qdev.c | 6 +++--- > hw/hyperv/hyperv.c | 2 +- > hw/i386/pc.c | 2 +- > hw/ide/microdrive.c | 8 ++++---- > hw/intc/spapr_xive.c | 2 +- > hw/ppc/pnv_psi.c | 2 +- > hw/ppc/spapr_pci.c | 2 +- > hw/ppc/spapr_vio.c | 2 +- > hw/s390x/s390-pci-inst.c | 2 +- > hw/scsi/vmw_pvscsi.c | 2 +- > hw/sd/omap_mmc.c | 2 +- > hw/sd/pl181.c | 2 +- > include/hw/qdev-core.h | 4 ++-- > 14 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c > index 6ecd383540..27b71c57cf 100644 > --- a/hw/audio/intel-hda.c > +++ b/hw/audio/intel-hda.c > @@ -1087,7 +1087,7 @@ static void intel_hda_reset(DeviceState *dev) > QTAILQ_FOREACH(kid, &d->codecs.qbus.children, sibling) { > DeviceState *qdev = kid->child; > cdev = HDA_CODEC_DEVICE(qdev); > - device_reset(DEVICE(cdev)); > + device_legacy_reset(DEVICE(cdev)); > d->state_sts |= (1 << cdev->cad); > } > intel_hda_update_irq(d); > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 60d66c2f39..a95d4fa87d 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -257,7 +257,7 @@ HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) > > static int qdev_reset_one(DeviceState *dev, void *opaque) > { > - device_reset(dev); > + device_legacy_reset(dev); > > return 0; > } > @@ -865,7 +865,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp) > } > } > if (dev->hotplugged) { > - device_reset(dev); > + device_legacy_reset(dev); > } > dev->pending_deleted_event = false; > > @@ -1087,7 +1087,7 @@ void device_class_set_parent_unrealize(DeviceClass *dc, > dc->unrealize = dev_unrealize; > } > > -void device_reset(DeviceState *dev) > +void device_legacy_reset(DeviceState *dev) > { > DeviceClass *klass = DEVICE_GET_CLASS(dev); > > diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c > index 6ebf31c310..cd9db3cb5c 100644 > --- a/hw/hyperv/hyperv.c > +++ b/hw/hyperv/hyperv.c > @@ -140,7 +140,7 @@ void hyperv_synic_reset(CPUState *cs) > SynICState *synic = get_synic(cs); > > if (synic) { > - device_reset(DEVICE(synic)); > + device_legacy_reset(DEVICE(synic)); > } > } > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3ab4bcb3ca..f33a8de42f 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -2826,7 +2826,7 @@ static void pc_machine_reset(MachineState *machine) > cpu = X86_CPU(cs); > > if (cpu->apic_state) { > - device_reset(cpu->apic_state); > + device_legacy_reset(cpu->apic_state); > } > } > } > diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c > index b0272ea14b..6b30e36ed8 100644 > --- a/hw/ide/microdrive.c > +++ b/hw/ide/microdrive.c > @@ -173,7 +173,7 @@ static void md_attr_write(PCMCIACardState *card, uint32_t at, uint8_t value) > case 0x00: /* Configuration Option Register */ > s->opt = value & 0xcf; > if (value & OPT_SRESET) { > - device_reset(DEVICE(s)); > + device_legacy_reset(DEVICE(s)); > } > md_interrupt_update(s); > break; > @@ -316,7 +316,7 @@ static void md_common_write(PCMCIACardState *card, uint32_t at, uint16_t value) > case 0xe: /* Device Control */ > s->ctrl = value; > if (value & CTRL_SRST) { > - device_reset(DEVICE(s)); > + device_legacy_reset(DEVICE(s)); > } > md_interrupt_update(s); > break; > @@ -541,7 +541,7 @@ static int dscm1xxxx_attach(PCMCIACardState *card) > md->attr_base = pcc->cis[0x74] | (pcc->cis[0x76] << 8); > md->io_base = 0x0; > > - device_reset(DEVICE(md)); > + device_legacy_reset(DEVICE(md)); > md_interrupt_update(md); > > return 0; > @@ -551,7 +551,7 @@ static int dscm1xxxx_detach(PCMCIACardState *card) > { > MicroDriveState *md = MICRODRIVE(card); > > - device_reset(DEVICE(md)); > + device_legacy_reset(DEVICE(md)); > return 0; > } > > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c > index aad981cb78..a0f1787ee0 100644 > --- a/hw/intc/spapr_xive.c > +++ b/hw/intc/spapr_xive.c > @@ -1514,7 +1514,7 @@ static target_ulong h_int_reset(PowerPCCPU *cpu, > return H_PARAMETER; > } > > - device_reset(DEVICE(xive)); > + device_legacy_reset(DEVICE(xive)); > > if (kvm_irqchip_in_kernel()) { > Error *local_err = NULL; > diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c > index 88ba8e7b9b..bfdc30d4e1 100644 > --- a/hw/ppc/pnv_psi.c > +++ b/hw/ppc/pnv_psi.c > @@ -705,7 +705,7 @@ static void pnv_psi_p9_mmio_write(void *opaque, hwaddr addr, > break; > case PSIHB9_INTERRUPT_CONTROL: > if (val & PSIHB9_IRQ_RESET) { > - device_reset(DEVICE(&psi9->source)); > + device_legacy_reset(DEVICE(&psi9->source)); > } > psi->regs[reg] = val; > break; > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index bf31fd854c..f4c918be8b 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -2031,7 +2031,7 @@ static int spapr_phb_children_reset(Object *child, void *opaque) > DeviceState *dev = (DeviceState *) object_dynamic_cast(child, TYPE_DEVICE); > > if (dev) { > - device_reset(dev); > + device_legacy_reset(dev); > } > > return 0; > diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c > index 0803649658..ff7ee4d822 100644 > --- a/hw/ppc/spapr_vio.c > +++ b/hw/ppc/spapr_vio.c > @@ -305,7 +305,7 @@ int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq) > static void spapr_vio_quiesce_one(SpaprVioDevice *dev) > { > if (dev->tcet) { > - device_reset(DEVICE(dev->tcet)); > + device_legacy_reset(DEVICE(dev->tcet)); > } > free_crq(dev); > } > diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c > index 00235148be..93cda37c27 100644 > --- a/hw/s390x/s390-pci-inst.c > +++ b/hw/s390x/s390-pci-inst.c > @@ -242,7 +242,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra) > stw_p(&ressetpci->hdr.rsp, CLP_RC_SETPCIFN_FHOP); > goto out; > } > - device_reset(DEVICE(pbdev)); > + device_legacy_reset(DEVICE(pbdev)); > pbdev->fh &= ~FH_MASK_ENABLE; > pbdev->state = ZPCI_FS_DISABLED; > stl_p(&ressetpci->fh, pbdev->fh); > diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c > index 452a3b63b2..7baab1532f 100644 > --- a/hw/scsi/vmw_pvscsi.c > +++ b/hw/scsi/vmw_pvscsi.c > @@ -838,7 +838,7 @@ pvscsi_on_cmd_reset_device(PVSCSIState *s) > > if (sdev != NULL) { > s->resetting++; > - device_reset(&sdev->qdev); > + device_legacy_reset(&sdev->qdev); > s->resetting--; > return PVSCSI_COMMAND_PROCESSING_SUCCEEDED; > } > diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c > index c6e516b611..4088a8a80b 100644 > --- a/hw/sd/omap_mmc.c > +++ b/hw/sd/omap_mmc.c > @@ -318,7 +318,7 @@ void omap_mmc_reset(struct omap_mmc_s *host) > * into any bus, and we must reset it manually. When omap_mmc is > * QOMified this must move into the QOM reset function. > */ > - device_reset(DEVICE(host->card)); > + device_legacy_reset(DEVICE(host->card)); > } > > static uint64_t omap_mmc_read(void *opaque, hwaddr offset, > diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c > index 8033fe455d..2b3776a6a0 100644 > --- a/hw/sd/pl181.c > +++ b/hw/sd/pl181.c > @@ -482,7 +482,7 @@ static void pl181_reset(DeviceState *d) > /* Since we're still using the legacy SD API the card is not plugged > * into any bus, and we must reset it manually. > */ > - device_reset(DEVICE(s->card)); > + device_legacy_reset(DEVICE(s->card)); > } > > static void pl181_init(Object *obj) > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index de70b7a19a..09e6dfd664 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -406,11 +406,11 @@ char *qdev_get_own_fw_dev_path_from_handler(BusState *bus, DeviceState *dev); > void qdev_machine_init(void); > > /** > - * @device_reset > + * device_legacy_reset: > * > * Reset a single device (by calling the reset method). > */ > -void device_reset(DeviceState *dev); > +void device_legacy_reset(DeviceState *dev); > > void device_class_set_parent_reset(DeviceClass *dc, > DeviceReset dev_reset, -- 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