The main aim of this patchseries is to remove the two remaining uses
of device_class_set_parent_reset() in the tree, which are virtio-ccw
and the s390 CPU class. Doing that lets us do some followup cleanup.
(The diffstat looks alarming but is almost all coccinelle automated
changes.)
Changes v1->v2:
* new patch 1 to convert hw/s390/ccw-device
(fixes bug discovered via s390 CI testing in v1)
* a couple of patches are already upstream
* in the target/s390 cpu patch, fix sigp_cpu_reset() to use
RESET_TYPE_S390_CPU_NORMAL
* new patches 10, 11 which take advantage of the new function
device_class_set_legacy_reset() to allow us to replace the
generic Resettable transitional_function machinery with a
simple wrapper that adapts from the API of the hold method
to the one used by the legacy reset method
Patches 1, 10, 11 need review. I believe that patch 1 should have
fixed the intermittent s390 issue we found with v1 of the patchset,
but if you could run these through the s390 CI again I'd
appreciate it.
(Brief summary of the series follows; if you read the v1
cover letter you can ignore the rest of this.)
Patches 1 and 2 are to convert the virtio-ccw device to
three-phase reset; patch 3 converts the s390 CPU, and involves
adding new Resettable ResetType enum values to handle the s390
CPU specific reset types that we previously were handling
locally in the s390 code.
The rest of the series is cleanup. The big diffstat is from
the Coccinelle-scripted conversion from directly setting
dc->reset to using a device_class_set_legacy_reset() function.
That in turn lets us simplify how we handle those legacy-reset
devices and remove a lot of the transitional machinery
from the Resettable class.
thanks
-- PMM
Peter Maydell (11):
hw/s390/ccw-device: Convert to three-phase reset
hw/s390/virtio-ccw: Convert to three-phase reset
target/s390: Convert CPU to Resettable interface
hw: Remove device_class_set_parent_reset()
target/alpha, hppa: Remove unused parent_reset fields
hw: Define new device_class_set_legacy_reset()
hw: Use device_class_set_legacy_reset() instead of opencoding
hw: Rename DeviceClass::reset field to legacy_reset
hw: Remove device_phases_reset()
hw/core/qdev: Simplify legacy_reset handling
hw/core/resettable: Remove transational_function machinery
docs/devel/reset.rst | 10 +++
scripts/coccinelle/device-reset.cocci | 30 +++++++++
hw/s390x/virtio-ccw.h | 2 +-
include/hw/qdev-core.h | 33 +++++----
include/hw/resettable.h | 15 +----
target/alpha/cpu.h | 2 -
target/hppa/cpu.h | 2 -
target/s390x/cpu.h | 21 ++----
hw/acpi/erst.c | 2 +-
hw/acpi/piix4.c | 2 +-
hw/adc/aspeed_adc.c | 2 +-
hw/adc/max111x.c | 2 +-
hw/adc/stm32f2xx_adc.c | 2 +-
hw/adc/zynq-xadc.c | 2 +-
hw/arm/armsse.c | 2 +-
hw/arm/highbank.c | 2 +-
hw/arm/musicpal.c | 6 +-
hw/arm/pxa2xx.c | 4 +-
hw/arm/strongarm.c | 4 +-
hw/audio/ac97.c | 2 +-
hw/audio/cs4231.c | 2 +-
hw/audio/cs4231a.c | 2 +-
hw/audio/es1370.c | 2 +-
hw/audio/hda-codec.c | 2 +-
hw/audio/intel-hda.c | 2 +-
hw/audio/marvell_88w8618.c | 2 +-
hw/audio/pl041.c | 2 +-
hw/audio/via-ac97.c | 2 +-
hw/block/fdc-isa.c | 2 +-
hw/block/fdc-sysbus.c | 2 +-
hw/block/m25p80.c | 2 +-
hw/block/nand.c | 2 +-
hw/block/onenand.c | 2 +-
hw/block/pflash_cfi01.c | 2 +-
hw/block/pflash_cfi02.c | 2 +-
hw/block/swim.c | 2 +-
hw/char/avr_usart.c | 2 +-
hw/char/cmsdk-apb-uart.c | 2 +-
hw/char/digic-uart.c | 2 +-
hw/char/escc.c | 2 +-
hw/char/etraxfs_ser.c | 2 +-
hw/char/exynos4210_uart.c | 2 +-
hw/char/goldfish_tty.c | 2 +-
hw/char/grlib_apbuart.c | 2 +-
hw/char/ibex_uart.c | 2 +-
hw/char/imx_serial.c | 2 +-
hw/char/mcf_uart.c | 2 +-
hw/char/mchp_pfsoc_mmuart.c | 2 +-
hw/char/nrf51_uart.c | 2 +-
hw/char/pl011.c | 2 +-
hw/char/renesas_sci.c | 2 +-
hw/char/sclpconsole-lm.c | 2 +-
hw/char/sclpconsole.c | 2 +-
hw/char/sh_serial.c | 2 +-
hw/char/shakti_uart.c | 2 +-
hw/char/stm32f2xx_usart.c | 2 +-
hw/char/xilinx_uartlite.c | 2 +-
hw/core/or-irq.c | 2 +-
hw/core/qdev.c | 97 ++++++++-------------------
hw/core/resettable.c | 24 +------
hw/cxl/switch-mailbox-cci.c | 2 +-
hw/display/artist.c | 2 +-
hw/display/ati.c | 2 +-
hw/display/bcm2835_fb.c | 2 +-
hw/display/cg3.c | 2 +-
hw/display/dpcd.c | 2 +-
hw/display/exynos4210_fimd.c | 2 +-
hw/display/g364fb.c | 2 +-
hw/display/i2c-ddc.c | 2 +-
hw/display/jazz_led.c | 2 +-
hw/display/macfb.c | 4 +-
hw/display/qxl.c | 2 +-
hw/display/sii9022.c | 2 +-
hw/display/sm501.c | 4 +-
hw/display/tcx.c | 2 +-
hw/display/vga-isa.c | 2 +-
hw/display/vga-mmio.c | 2 +-
hw/display/vga-pci.c | 2 +-
hw/display/vmware_vga.c | 2 +-
hw/display/xlnx_dp.c | 2 +-
hw/dma/bcm2835_dma.c | 2 +-
hw/dma/i8257.c | 2 +-
hw/dma/pl080.c | 2 +-
hw/dma/pl330.c | 2 +-
hw/dma/rc4030.c | 2 +-
hw/dma/sparc32_dma.c | 2 +-
hw/dma/xilinx_axidma.c | 2 +-
hw/dma/xlnx-zdma.c | 2 +-
hw/dma/xlnx-zynq-devcfg.c | 2 +-
hw/dma/xlnx_csu_dma.c | 2 +-
hw/dma/xlnx_dpdma.c | 2 +-
hw/fsi/aspeed_apb2opb.c | 2 +-
hw/fsi/fsi-master.c | 2 +-
hw/fsi/fsi.c | 2 +-
hw/fsi/lbus.c | 2 +-
hw/gpio/aspeed_gpio.c | 2 +-
hw/gpio/bcm2835_gpio.c | 2 +-
hw/gpio/bcm2838_gpio.c | 2 +-
hw/gpio/gpio_key.c | 2 +-
hw/gpio/imx_gpio.c | 2 +-
hw/gpio/max7310.c | 2 +-
hw/gpio/mpc8xxx.c | 2 +-
hw/gpio/nrf51_gpio.c | 2 +-
hw/gpio/omap_gpio.c | 4 +-
hw/gpio/pca9552.c | 2 +-
hw/gpio/pca9554.c | 2 +-
hw/gpio/pcf8574.c | 2 +-
hw/gpio/sifive_gpio.c | 2 +-
hw/hyperv/hyperv.c | 2 +-
hw/hyperv/vmbus.c | 2 +-
hw/i2c/aspeed_i2c.c | 4 +-
hw/i2c/bcm2835_i2c.c | 2 +-
hw/i2c/exynos4210_i2c.c | 2 +-
hw/i2c/imx_i2c.c | 2 +-
hw/i2c/microbit_i2c.c | 2 +-
hw/i2c/mpc_i2c.c | 2 +-
hw/i2c/omap_i2c.c | 2 +-
hw/i2c/ppc4xx_i2c.c | 2 +-
hw/i2c/smbus_eeprom.c | 2 +-
hw/i386/amd_iommu.c | 2 +-
hw/i386/intel_iommu.c | 2 +-
hw/i386/kvm/i8254.c | 2 +-
hw/i386/kvm/i8259.c | 2 +-
hw/i386/kvm/ioapic.c | 2 +-
hw/i386/kvm/xen_overlay.c | 2 +-
hw/i386/port92.c | 2 +-
hw/i386/vapic.c | 2 +-
hw/i386/vmmouse.c | 2 +-
hw/i386/xen/xen_platform.c | 2 +-
hw/ide/ahci.c | 2 +-
hw/ide/cmd646.c | 2 +-
hw/ide/ich.c | 2 +-
hw/ide/isa.c | 2 +-
hw/ide/macio.c | 2 +-
hw/ide/microdrive.c | 2 +-
hw/ide/mmio.c | 2 +-
hw/ide/piix.c | 4 +-
hw/ide/sii3112.c | 2 +-
hw/ide/via.c | 2 +-
hw/input/adb-kbd.c | 2 +-
hw/input/adb-mouse.c | 2 +-
hw/input/lm832x.c | 2 +-
hw/input/pckbd.c | 4 +-
hw/intc/allwinner-a10-pic.c | 2 +-
hw/intc/apic_common.c | 2 +-
hw/intc/armv7m_nvic.c | 2 +-
hw/intc/aspeed_intc.c | 2 +-
hw/intc/aspeed_vic.c | 2 +-
hw/intc/bcm2835_ic.c | 2 +-
hw/intc/bcm2836_control.c | 2 +-
hw/intc/exynos4210_combiner.c | 2 +-
hw/intc/goldfish_pic.c | 2 +-
hw/intc/grlib_irqmp.c | 2 +-
hw/intc/heathrow_pic.c | 2 +-
hw/intc/i8259.c | 2 +-
hw/intc/imx_avic.c | 2 +-
hw/intc/imx_gpcv2.c | 2 +-
hw/intc/ioapic.c | 2 +-
hw/intc/loongarch_extioi.c | 2 +-
hw/intc/loongarch_pch_pic.c | 2 +-
hw/intc/m68k_irqc.c | 2 +-
hw/intc/omap_intc.c | 4 +-
hw/intc/openpic.c | 2 +-
hw/intc/openpic_kvm.c | 2 +-
hw/intc/pl190.c | 2 +-
hw/intc/ppc-uic.c | 2 +-
hw/intc/s390_flic.c | 2 +-
hw/intc/s390_flic_kvm.c | 2 +-
hw/intc/sifive_plic.c | 2 +-
hw/intc/slavio_intctl.c | 2 +-
hw/intc/xlnx-pmu-iomod-intc.c | 2 +-
hw/intc/xlnx-zynqmp-ipi.c | 2 +-
hw/isa/lpc_ich9.c | 2 +-
hw/isa/pc87312.c | 2 +-
hw/isa/piix.c | 2 +-
hw/isa/vt82c686.c | 10 +--
hw/m68k/mcf5206.c | 2 +-
hw/m68k/mcf_intc.c | 2 +-
hw/m68k/next-cube.c | 2 +-
hw/m68k/next-kbd.c | 2 +-
hw/mem/cxl_type3.c | 2 +-
hw/misc/a9scu.c | 2 +-
hw/misc/allwinner-cpucfg.c | 2 +-
hw/misc/allwinner-h3-ccu.c | 2 +-
hw/misc/allwinner-h3-dramc.c | 2 +-
hw/misc/allwinner-h3-sysctrl.c | 2 +-
hw/misc/allwinner-r40-ccu.c | 2 +-
hw/misc/allwinner-r40-dramc.c | 2 +-
hw/misc/allwinner-sid.c | 2 +-
hw/misc/allwinner-sramc.c | 2 +-
hw/misc/applesmc.c | 2 +-
hw/misc/arm_l2x0.c | 2 +-
hw/misc/arm_sysctl.c | 2 +-
hw/misc/armsse-cpu-pwrctrl.c | 2 +-
hw/misc/armsse-mhu.c | 2 +-
hw/misc/aspeed_hace.c | 2 +-
hw/misc/aspeed_i3c.c | 4 +-
hw/misc/aspeed_lpc.c | 2 +-
hw/misc/aspeed_peci.c | 2 +-
hw/misc/aspeed_sbc.c | 2 +-
hw/misc/aspeed_scu.c | 10 +--
hw/misc/aspeed_sdmc.c | 4 +-
hw/misc/aspeed_xdma.c | 2 +-
hw/misc/avr_power.c | 2 +-
hw/misc/bcm2835_cprman.c | 8 +--
hw/misc/bcm2835_mbox.c | 2 +-
hw/misc/bcm2835_mphi.c | 2 +-
hw/misc/bcm2835_powermgt.c | 2 +-
hw/misc/bcm2835_rng.c | 2 +-
hw/misc/bcm2835_thermal.c | 2 +-
hw/misc/eccmemctl.c | 2 +-
hw/misc/exynos4210_clk.c | 2 +-
hw/misc/exynos4210_pmu.c | 2 +-
hw/misc/exynos4210_rng.c | 2 +-
hw/misc/imx25_ccm.c | 2 +-
hw/misc/imx31_ccm.c | 2 +-
hw/misc/imx6_ccm.c | 2 +-
hw/misc/imx6_src.c | 2 +-
hw/misc/imx6ul_ccm.c | 2 +-
hw/misc/imx7_ccm.c | 4 +-
hw/misc/imx7_snvs.c | 2 +-
hw/misc/imx7_src.c | 2 +-
hw/misc/imx_rngc.c | 2 +-
hw/misc/iotkit-secctl.c | 2 +-
hw/misc/iotkit-sysctl.c | 2 +-
hw/misc/ivshmem.c | 2 +-
hw/misc/lasi.c | 2 +-
hw/misc/led.c | 2 +-
hw/misc/macio/cuda.c | 2 +-
hw/misc/macio/gpio.c | 2 +-
hw/misc/macio/mac_dbdma.c | 2 +-
hw/misc/macio/pmu.c | 2 +-
hw/misc/mips_cmgcr.c | 2 +-
hw/misc/mips_cpc.c | 2 +-
hw/misc/mips_itu.c | 2 +-
hw/misc/mps2-fpgaio.c | 2 +-
hw/misc/mps2-scc.c | 2 +-
hw/misc/msf2-sysreg.c | 2 +-
hw/misc/nrf51_rng.c | 2 +-
hw/misc/pci-testdev.c | 2 +-
hw/misc/sifive_e_aon.c | 2 +-
hw/misc/sifive_u_prci.c | 2 +-
hw/misc/slavio_misc.c | 2 +-
hw/misc/stm32f2xx_syscfg.c | 2 +-
hw/misc/stm32f4xx_exti.c | 2 +-
hw/misc/stm32f4xx_syscfg.c | 2 +-
hw/misc/tz-mpc.c | 2 +-
hw/misc/tz-msc.c | 2 +-
hw/misc/tz-ppc.c | 2 +-
hw/misc/virt_ctrl.c | 2 +-
hw/misc/xlnx-versal-cfu.c | 2 +-
hw/net/allwinner-sun8i-emac.c | 2 +-
hw/net/allwinner_emac.c | 2 +-
hw/net/cadence_gem.c | 2 +-
hw/net/can/can_kvaser_pci.c | 2 +-
hw/net/can/can_mioe3680_pci.c | 2 +-
hw/net/can/can_pcm3680_pci.c | 2 +-
hw/net/can/ctucan_pci.c | 2 +-
hw/net/can/xlnx-versal-canfd.c | 2 +-
hw/net/dp8393x.c | 2 +-
hw/net/etraxfs_eth.c | 2 +-
hw/net/fsl_etsec/etsec.c | 2 +-
hw/net/ftgmac100.c | 4 +-
hw/net/imx_fec.c | 2 +-
hw/net/lan9118.c | 2 +-
hw/net/lance.c | 2 +-
hw/net/lasi_i82596.c | 2 +-
hw/net/mcf_fec.c | 2 +-
hw/net/mipsnet.c | 2 +-
hw/net/msf2-emac.c | 2 +-
hw/net/npcm7xx_emc.c | 2 +-
hw/net/npcm_gmac.c | 2 +-
hw/net/opencores_eth.c | 2 +-
hw/net/pcnet-pci.c | 2 +-
hw/net/rocker/rocker.c | 2 +-
hw/net/rtl8139.c | 2 +-
hw/net/smc91c111.c | 2 +-
hw/net/stellaris_enet.c | 2 +-
hw/net/sungem.c | 2 +-
hw/net/sunhme.c | 2 +-
hw/net/tulip.c | 2 +-
hw/net/vmxnet3.c | 2 +-
hw/net/xilinx_axienet.c | 2 +-
hw/net/xilinx_ethlite.c | 2 +-
hw/nvme/ctrl.c | 2 +-
hw/nvram/eeprom_at24c.c | 2 +-
hw/nvram/fw_cfg.c | 2 +-
hw/nvram/mac_nvram.c | 2 +-
hw/nvram/nrf51_nvm.c | 2 +-
hw/pci-bridge/cxl_downstream.c | 2 +-
hw/pci-bridge/cxl_upstream.c | 2 +-
hw/pci-bridge/i82801b11.c | 2 +-
hw/pci-bridge/pci_bridge_dev.c | 2 +-
hw/pci-bridge/pci_expander_bridge.c | 2 +-
hw/pci-bridge/pcie_pci_bridge.c | 2 +-
hw/pci-bridge/simba.c | 2 +-
hw/pci-bridge/xio3130_downstream.c | 2 +-
hw/pci-bridge/xio3130_upstream.c | 2 +-
hw/pci-host/astro.c | 4 +-
hw/pci-host/designware.c | 2 +-
hw/pci-host/dino.c | 2 +-
hw/pci-host/gt64120.c | 2 +-
hw/pci-host/mv64361.c | 2 +-
hw/pci-host/ppc440_pcix.c | 2 +-
hw/pci-host/q35.c | 2 +-
hw/pci-host/sabre.c | 2 +-
hw/pci-host/versatile.c | 2 +-
hw/pci-host/xilinx-pcie.c | 2 +-
hw/ppc/pnv_psi.c | 4 +-
hw/ppc/ppc405_boards.c | 2 +-
hw/ppc/ppc405_uc.c | 12 ++--
hw/ppc/ppc4xx_devs.c | 6 +-
hw/ppc/ppc4xx_sdram.c | 4 +-
hw/ppc/ppce500_spin.c | 2 +-
hw/ppc/spapr_cpu_core.c | 2 +-
hw/ppc/spapr_iommu.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/ppc/spapr_vio.c | 2 +-
hw/remote/proxy.c | 2 +-
hw/rtc/allwinner-rtc.c | 2 +-
hw/rtc/aspeed_rtc.c | 2 +-
hw/rtc/ds1338.c | 2 +-
hw/rtc/exynos4210_rtc.c | 2 +-
hw/rtc/goldfish_rtc.c | 2 +-
hw/rtc/ls7a_rtc.c | 2 +-
hw/rtc/m48t59-isa.c | 2 +-
hw/rtc/m48t59.c | 2 +-
hw/rtc/xlnx-zynqmp-rtc.c | 2 +-
hw/s390x/ccw-device.c | 7 +-
hw/s390x/event-facility.c | 2 +-
hw/s390x/ipl.c | 2 +-
hw/s390x/s390-pci-bus.c | 4 +-
hw/s390x/sclpquiesce.c | 2 +-
hw/s390x/virtio-ccw.c | 13 ++--
hw/scsi/esp-pci.c | 2 +-
hw/scsi/esp.c | 2 +-
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/megasas.c | 2 +-
hw/scsi/mptsas.c | 2 +-
hw/scsi/scsi-disk.c | 2 +-
hw/scsi/scsi-generic.c | 2 +-
hw/scsi/vmw_pvscsi.c | 2 +-
hw/sd/allwinner-sdhost.c | 2 +-
hw/sd/aspeed_sdhci.c | 2 +-
hw/sd/bcm2835_sdhost.c | 2 +-
hw/sd/cadence_sdhci.c | 2 +-
hw/sd/npcm7xx_sdhci.c | 2 +-
hw/sd/pl181.c | 2 +-
hw/sd/pxa2xx_mmci.c | 2 +-
hw/sd/sd.c | 2 +-
hw/sd/sdhci.c | 2 +-
hw/sd/ssi-sd.c | 2 +-
hw/sensor/dps310.c | 2 +-
hw/sensor/emc141x.c | 2 +-
hw/sensor/lsm303dlhc_mag.c | 2 +-
hw/sparc/sun4m_iommu.c | 2 +-
hw/sparc64/sun4u_iommu.c | 2 +-
hw/ssi/aspeed_smc.c | 2 +-
hw/ssi/bcm2835_spi.c | 2 +-
hw/ssi/ibex_spi_host.c | 2 +-
hw/ssi/imx_spi.c | 2 +-
hw/ssi/mss-spi.c | 2 +-
hw/ssi/pl022.c | 2 +-
hw/ssi/pnv_spi.c | 2 +-
hw/ssi/sifive_spi.c | 2 +-
hw/ssi/stm32f2xx_spi.c | 2 +-
hw/ssi/xilinx_spi.c | 2 +-
hw/ssi/xilinx_spips.c | 4 +-
hw/ssi/xlnx-versal-ospi.c | 2 +-
hw/timer/a9gtimer.c | 2 +-
hw/timer/allwinner-a10-pit.c | 2 +-
hw/timer/arm_mptimer.c | 2 +-
hw/timer/armv7m_systick.c | 2 +-
hw/timer/aspeed_timer.c | 2 +-
hw/timer/avr_timer16.c | 2 +-
hw/timer/bcm2835_systmr.c | 2 +-
hw/timer/cmsdk-apb-dualtimer.c | 2 +-
hw/timer/cmsdk-apb-timer.c | 2 +-
hw/timer/digic-timer.c | 2 +-
hw/timer/exynos4210_mct.c | 2 +-
hw/timer/exynos4210_pwm.c | 2 +-
hw/timer/grlib_gptimer.c | 2 +-
hw/timer/hpet.c | 2 +-
hw/timer/i8254.c | 2 +-
hw/timer/ibex_timer.c | 2 +-
hw/timer/imx_epit.c | 2 +-
hw/timer/imx_gpt.c | 2 +-
hw/timer/nrf51_timer.c | 2 +-
hw/timer/renesas_cmt.c | 2 +-
hw/timer/renesas_tmr.c | 2 +-
hw/timer/sifive_pwm.c | 2 +-
hw/timer/slavio_timer.c | 2 +-
hw/timer/sse-counter.c | 2 +-
hw/timer/sse-timer.c | 2 +-
hw/timer/stm32f2xx_timer.c | 2 +-
hw/tpm/tpm_tis_i2c.c | 2 +-
hw/tpm/tpm_tis_isa.c | 2 +-
hw/tpm/tpm_tis_sysbus.c | 2 +-
hw/tricore/tricore_testdevice.c | 2 +-
hw/usb/hcd-dwc3.c | 2 +-
hw/usb/hcd-ehci-pci.c | 2 +-
hw/usb/hcd-ehci-sysbus.c | 2 +-
hw/usb/hcd-ohci-pci.c | 2 +-
hw/usb/hcd-ohci-sysbus.c | 2 +-
hw/usb/hcd-uhci.c | 2 +-
hw/usb/hcd-xhci-pci.c | 2 +-
hw/usb/hcd-xhci-sysbus.c | 2 +-
hw/usb/hcd-xhci.c | 2 +-
hw/usb/imx-usb-phy.c | 2 +-
hw/usb/tusb6010.c | 2 +-
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 2 +-
hw/vfio/pci.c | 2 +-
hw/virtio/virtio-mmio.c | 2 +-
hw/watchdog/cmsdk-apb-watchdog.c | 2 +-
hw/watchdog/sbsa_gwdt.c | 2 +-
hw/watchdog/wdt_aspeed.c | 2 +-
hw/watchdog/wdt_diag288.c | 2 +-
hw/watchdog/wdt_i6300esb.c | 2 +-
hw/watchdog/wdt_ib700.c | 2 +-
hw/watchdog/wdt_imx2.c | 2 +-
target/s390x/cpu.c | 38 +++++------
target/s390x/sigp.c | 8 +--
423 files changed, 571 insertions(+), 625 deletions(-)
create mode 100644 scripts/coccinelle/device-reset.cocci
--
2.34.1