qom: Automated conversion of type checking boilerplate
Subsystems (15)
PATCH v4 11/18 Use DECLARE_*CHECKER* macros
In reply to Eduardo Habkost$ ./scripts/codeconverter/converter.py -i \ --pattern=TypeCheckMacro $(git grep -l '' -- '*.[ch]')
---
Changes v3 -> v4:
* Removed hunk due to rebase conflict:
hw/hppa/lasi.c include/hw/arm/armsse.h include/hw/virtio/vhost-user-blk.h
* Reviewed-by lines from v3 were kept, as no additional hunks are introduced in this version
Changes v2 -> v3:
* Removed hunks due to rebase conflicts:
hw/arm/integratorcp.c hw/arm/versatilepb.c hw/sd/pl181.c include/hw/ppc/xive.h
* Reviewed-by line from Daniel was kept, as no additional hunks are introduced in this version
Changes v1 -> v2:
* Re-ran script after moving a few macros and typedefs. Now the following types are also handled by this patch:
- TYPE_ALLWINNER_AHCI
- TYPE_ARM_SSE
- TYPE_AUXTOI2C
- TYPE_I8042
- TYPE_I8257
- TYPE_ICH9_AHCI
- TYPE_KVM_ACCEL
- TYPE_MPTSAS1068
- TYPE_PIIX3_PCI_DEVICE
- TYPE_PXA2XX_FIR
- TYPE_PXA2XX_I2C
- TYPE_PXA2XX_MMCI
- TYPE_PXA2XX_PCMCIA
- TYPE_ROCKER
- TYPE_SCLP_EVENT_FACILITY
- TYPE_SPAPR_MACHINE
- TYPE_SYSBUS_AHCI
- TYPE_VFIO_PCI
- TYPE_VHOST_USER_GPU
- TYPE_VIRTIO_SERIAL_BUS
- TYPE_VMBUS
- TYPE_XENBACKEND
* Re-ran script after making it look for typedefs in typedefs.h. Now the following types are also handled by this patch:
- TYPE_BUS
- TYPE_CHARDEV
- TYPE_DEVICE
- TYPE_FW_CFG
- TYPE_FW_CFG_IO
- TYPE_FW_CFG_MEM
- TYPE_I2C_BUS
- TYPE_IOMMU_MEMORY_REGION
- TYPE_ISA_BUS
- TYPE_ISA_DEVICE
- TYPE_MACHINE
- TYPE_MEMORY_REGION
- TYPE_NETFILTER
- TYPE_PCI_BRIDGE
- TYPE_PCI_BUS
- TYPE_PCI_DEVICE
- TYPE_PCIE_HOST_BRIDGE
- TYPE_PCIE_PORT
- TYPE_PCIE_SLOT
- TYPE_PCI_HOST_BRIDGE
- TYPE_PC_MACHINE
- TYPE_PNV_PHB3_IOMMU_MEMORY_REGION
- TYPE_PNV_PHB4_IOMMU_MEMORY_REGION
- TYPE_QEMU_CONSOLE
- TYPE_SPAPR_IOMMU_MEMORY_REGION
- TYPE_SSI_BUS
- TYPE_SYSTEM_BUS
- TYPE_VERSATILE_PCI_HOST
- TYPE_VIRTIO_DEVICE
* Re-ran script after changing it to not look for typedefs if the macro is using "struct [...]" types directly. Now the following types are also handled by this patch:
- TYPE_ETRAX_FS_PIC
- TYPE_IRQ
- TYPE_LOONGSON_LIOINTC
- TYPE_OMAP1_GPIO
- TYPE_OMAP2_GPIO
- TYPE_VMWARE_SVGA
- TYPE_XILINX_ETHLITE
- TYPE_XILINX_INTC
- TYPE_XILINX_TIMER
---
Cc: Richard Henderson <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: "Gonglei (Arei)" <[email protected]>
Cc: "Marc-André Lureau" <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Cc: Igor Mammedov <[email protected]>
Cc: Laurent Vivier <[email protected]>
Cc: Amit Shah <[email protected]>
Cc: Stefan Berger <[email protected]>
Cc: Samuel Thibault <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Greg Kurz <[email protected]>
Cc: Christian Schoenebeck <[email protected]>
Cc: Aleksandar Markovic <[email protected]>
Cc: "Philippe Mathieu-Daudé" <[email protected]>
Cc: Aurelien Jarno <[email protected]>
Cc: Marcel Apfelbaum <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Joel Stanley <[email protected]>
Cc: Jan Kiszka <[email protected]>
Cc: Andrzej Zaborowski <[email protected]>
Cc: Andrew Baumann <[email protected]>
Cc: Radoslaw Biernacki <[email protected]>
Cc: Leif Lindholm <[email protected]>
Cc: "Edgar E. Iglesias" <[email protected]>
Cc: Alistair Francis <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Michael Walle <[email protected]>
Cc: Sarah Harris <[email protected]>
Cc: Michael Rolnik <[email protected]>
Cc: John Snow <[email protected]>
Cc: Kevin Wolf <[email protected]>
Cc: Max Reitz <[email protected]>
Cc: Keith Busch <[email protected]>
Cc: Igor Mitsyanko <[email protected]>
Cc: Fabien Chouteau <[email protected]>
Cc: KONRAD Frederic <[email protected]>
Cc: Alberto Garcia <[email protected]>
Cc: Thomas Huth <[email protected]>
Cc: Cornelia Huck <[email protected]>
Cc: Halil Pasic <[email protected]>
Cc: Christian Borntraeger <[email protected]>
Cc: David Gibson <[email protected]>
Cc: Mark Cave-Ayland <[email protected]>
Cc: "Hervé Poussineau" <[email protected]>
Cc: Aleksandar Rikalo <[email protected]>
Cc: BALATON Zoltan <[email protected]>
Cc: Guan Xuetao <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: Corey Minyard <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Anthony Perard <[email protected]>
Cc: Paul Durrant <[email protected]>
Cc: Huacai Chen <[email protected]>
Cc: Jiaxun Yang <[email protected]>
Cc: Chris Wulff <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Paul Burton <[email protected]>
Cc: Jiri Slaby <[email protected]>
Cc: Artyom Tarasenko <[email protected]>
Cc: "Cédric Le Goater" <[email protected]>
Cc: Andrew Jeffery <[email protected]>
Cc: Jason Wang <[email protected]>
Cc: Dmitry Fleytman <[email protected]>
Cc: Max Filippov <[email protected]>
Cc: Jiri Pirko <[email protected]>
Cc: Sven Schnelle <[email protected]>
Cc: Yuval Shaia <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Cc: David Hildenbrand <[email protected]>
Cc: Matthew Rosato <[email protected]>
Cc: Fam Zheng <[email protected]>
Cc: Hannes Reinecke <[email protected]>
Cc: Alex Williamson <[email protected]>
Cc: Tony Krowiak <[email protected]>
Cc: Pierre Morel <[email protected]>
Cc: Raphael Norwitz <[email protected]>
Cc: "Dr. David Alan Gilbert" <[email protected]>
Cc: Stefan Hajnoczi <[email protected]>
Cc: Eric Auger <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: Ben Warren <[email protected]>
Cc: Beniamino Galvani <[email protected]>
Cc: Niek Linnenbank <[email protected]>
Cc: Antony Pavlov <[email protected]>
Cc: Jean-Christophe Dubois <[email protected]>
Cc: Peter Chubb <[email protected]>
Cc: Andrey Smirnov <[email protected]>
Cc: Subbaraya Sundeep <[email protected]>
Cc: Magnus Damm <[email protected]>
Cc: Peter Xu <[email protected]>
Cc: Sergio Lopez <[email protected]>
Cc: Xiao Guangrong <[email protected]>
Cc: Laszlo Ersek <[email protected]>
Cc: Palmer Dabbelt <[email protected]>
Cc: Sagar Karandikar <[email protected]>
Cc: Bastian Koppelmann <[email protected]>
Cc: Anup Patel <[email protected]>
Cc: Eric Farman <[email protected]>
Cc: Juan Quintela <[email protected]>
Cc: Cameron Esfahani <[email protected]>
Cc: Roman Bolshakov <[email protected]>
Cc: Zhang Chen <[email protected]>
Cc: Li Zhijian <[email protected]>
Cc: Pavel Dovgalyuk <[email protected]>
Cc: Anthony Green <[email protected]>
Cc: Stafford Horne <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- chardev/chardev-internal.h | 3 +- hw/9pfs/virtio-9p.h | 4 +- hw/audio/intel-hda.h | 11 ++-- hw/avr/atmega.h | 3 +- hw/block/nvme.h | 4 +- hw/display/ati_int.h | 3 +- hw/display/qxl.h | 3 +- hw/display/virtio-vga.h | 8 +-- hw/i386/amd_iommu.h | 4 +- hw/misc/tmp105.h | 3 +- hw/net/fsl_etsec/etsec.h | 4 +- hw/net/rocker/rocker.h | 4 +- hw/net/tulip.h | 3 +- hw/net/vmxnet3_defs.h | 3 +- hw/ppc/e500-ccsr.h | 3 +- hw/ppc/e500.h | 8 +-- hw/ppc/mac.h | 8 +-- hw/rdma/vmw/pvrdma.h | 3 +- hw/s390x/ccw-device.h | 7 +-- hw/s390x/ipl.h | 3 +- hw/s390x/s390-pci-bus.h | 16 +++--- hw/s390x/virtio-ccw.h | 68 +++++++++++------------- hw/scsi/mptsas.h | 4 +- hw/usb/ccid.h | 8 +-- hw/usb/hcd-dwc2.h | 8 +-- hw/usb/hcd-ehci.h | 15 +++--- hw/usb/hcd-ohci.h | 3 +- hw/usb/hcd-xhci.h | 4 +- hw/vfio/pci.h | 3 +- hw/virtio/virtio-mem-pci.h | 4 +- hw/virtio/virtio-pci.h | 16 ++---- hw/virtio/virtio-pmem-pci.h | 4 +- hw/xen/xen_pt.h | 4 +- include/authz/base.h | 11 +--- include/authz/list.h | 11 +--- include/authz/listfile.h | 11 +--- include/authz/pamacct.h | 11 +--- include/authz/simple.h | 11 +--- include/block/throttle-groups.h | 3 +- include/chardev/char-fd.h | 3 +- include/chardev/char-win.h | 3 +- include/chardev/char.h | 7 +-- include/chardev/spice.h | 3 +- include/crypto/secret.h | 4 +- include/crypto/secret_common.h | 10 +--- include/crypto/secret_keyring.h | 11 +--- include/crypto/tls-cipher-suites.h | 4 +- include/crypto/tlscreds.h | 4 +- include/crypto/tlscredsanon.h | 4 +- include/crypto/tlscredspsk.h | 4 +- include/crypto/tlscredsx509.h | 4 +- include/exec/memory.h | 14 ++--- include/hw/acpi/acpi_dev_interface.h | 8 +-- include/hw/acpi/generic_event_device.h | 4 +- include/hw/acpi/vmgenid.h | 3 +- include/hw/adc/stm32f2xx_adc.h | 4 +- include/hw/arm/allwinner-a10.h | 3 +- include/hw/arm/allwinner-h3.h | 3 +- include/hw/arm/armv7m.h | 6 ++- include/hw/arm/aspeed.h | 8 +-- include/hw/arm/aspeed_soc.h | 7 +-- include/hw/arm/bcm2835_peripherals.h | 4 +- include/hw/arm/bcm2836.h | 7 +-- include/hw/arm/digic.h | 3 +- include/hw/arm/exynos4210.h | 4 +- include/hw/arm/fsl-imx25.h | 3 +- include/hw/arm/fsl-imx31.h | 3 +- include/hw/arm/fsl-imx6.h | 3 +- include/hw/arm/fsl-imx6ul.h | 3 +- include/hw/arm/fsl-imx7.h | 3 +- include/hw/arm/linux-boot-if.h | 6 +-- include/hw/arm/msf2-soc.h | 3 +- include/hw/arm/nrf51_soc.h | 4 +- include/hw/arm/omap.h | 15 +++--- include/hw/arm/pxa.h | 14 ++--- include/hw/arm/smmu-common.h | 7 +-- include/hw/arm/smmuv3.h | 7 +-- include/hw/arm/stm32f205_soc.h | 4 +- include/hw/arm/stm32f405_soc.h | 4 +- include/hw/arm/virt.h | 8 +-- include/hw/arm/xlnx-versal.h | 3 +- include/hw/arm/xlnx-zynqmp.h | 4 +- include/hw/block/flash.h | 8 +-- include/hw/block/swim.h | 6 ++- include/hw/boards.h | 8 +-- include/hw/char/avr_usart.h | 4 +- include/hw/char/bcm2835_aux.h | 3 +- include/hw/char/cadence_uart.h | 4 +- include/hw/char/cmsdk-apb-uart.h | 4 +- include/hw/char/digic-uart.h | 4 +- include/hw/char/escc.h | 3 +- include/hw/char/ibex_uart.h | 4 +- include/hw/char/imx_serial.h | 3 +- include/hw/char/nrf51_uart.h | 3 +- include/hw/char/pl011.h | 3 +- include/hw/char/renesas_sci.h | 3 +- include/hw/char/serial.h | 9 ++-- include/hw/char/stm32f2xx_usart.h | 4 +- include/hw/clock.h | 3 +- include/hw/core/cpu.h | 4 +- include/hw/core/generic-loader.h | 4 +- include/hw/core/split-irq.h | 3 +- include/hw/cpu/a15mpcore.h | 4 +- include/hw/cpu/a9mpcore.h | 4 +- include/hw/cpu/arm11mpcore.h | 4 +- include/hw/cpu/cluster.h | 4 +- include/hw/cpu/core.h | 4 +- include/hw/display/bcm2835_fb.h | 3 +- include/hw/display/dpcd.h | 3 +- include/hw/display/i2c-ddc.h | 3 +- include/hw/display/macfb.h | 4 +- include/hw/display/xlnx_dp.h | 3 +- include/hw/dma/bcm2835_dma.h | 4 +- include/hw/dma/i8257.h | 4 +- include/hw/dma/pl080.h | 3 +- include/hw/dma/xlnx-zdma.h | 4 +- include/hw/dma/xlnx-zynq-devcfg.h | 4 +- include/hw/dma/xlnx_dpdma.h | 3 +- include/hw/fw-path-provider.h | 6 +-- include/hw/gpio/aspeed_gpio.h | 7 +-- include/hw/gpio/bcm2835_gpio.h | 4 +- include/hw/gpio/imx_gpio.h | 3 +- include/hw/gpio/nrf51_gpio.h | 3 +- include/hw/hotplug.h | 6 +-- include/hw/hyperv/vmbus-bridge.h | 3 +- include/hw/hyperv/vmbus.h | 11 ++-- include/hw/i2c/arm_sbcon_i2c.h | 4 +- include/hw/i2c/aspeed_i2c.h | 8 +-- include/hw/i2c/i2c.h | 11 ++-- include/hw/i2c/imx_i2c.h | 3 +- include/hw/i2c/microbit_i2c.h | 4 +- include/hw/i2c/ppc4xx_i2c.h | 3 +- include/hw/i2c/smbus_slave.h | 8 +-- include/hw/i386/apic_internal.h | 8 +-- include/hw/i386/ich9.h | 4 +- include/hw/i386/intel_iommu.h | 4 +- include/hw/i386/ioapic_internal.h | 8 +-- include/hw/i386/microvm.h | 8 +-- include/hw/i386/pc.h | 8 +-- include/hw/i386/x86.h | 8 +-- include/hw/ide/ahci.h | 11 ++-- include/hw/ide/internal.h | 11 ++-- include/hw/ide/pci.h | 3 +- include/hw/input/adb.h | 10 ++-- include/hw/input/i8042.h | 3 +- include/hw/intc/allwinner-a10-pic.h | 3 +- include/hw/intc/arm_gic_common.h | 8 +-- include/hw/intc/arm_gicv3_common.h | 8 +-- include/hw/intc/arm_gicv3_its_common.h | 8 +-- include/hw/intc/armv7m_nvic.h | 4 +- include/hw/intc/aspeed_vic.h | 3 +- include/hw/intc/bcm2835_ic.h | 3 +- include/hw/intc/bcm2836_control.h | 4 +- include/hw/intc/heathrow_pic.h | 3 +- include/hw/intc/ibex_plic.h | 4 +- include/hw/intc/imx_avic.h | 3 +- include/hw/intc/imx_gpcv2.h | 3 +- include/hw/intc/intc.h | 6 +-- include/hw/intc/mips_gic.h | 3 +- include/hw/intc/realview_gic.h | 4 +- include/hw/intc/rx_icu.h | 3 +- include/hw/intc/xlnx-pmu-iomod-intc.h | 4 +- include/hw/intc/xlnx-zynqmp-ipi.h | 4 +- include/hw/ipack/ipack.h | 11 ++-- include/hw/ipmi/ipmi.h | 18 +++---- include/hw/isa/i8259_internal.h | 8 +-- include/hw/isa/isa.h | 17 +++--- include/hw/isa/pc87312.h | 3 +- include/hw/isa/superio.h | 8 +-- include/hw/m68k/mcf_fec.h | 3 +- include/hw/mem/memory-device.h | 6 +-- include/hw/mem/nvdimm.h | 6 +-- include/hw/mem/pc-dimm.h | 8 +-- include/hw/mips/cps.h | 3 +- include/hw/misc/a9scu.h | 3 +- include/hw/misc/allwinner-cpucfg.h | 4 +- include/hw/misc/allwinner-h3-ccu.h | 4 +- include/hw/misc/allwinner-h3-dramc.h | 4 +- include/hw/misc/allwinner-h3-sysctrl.h | 4 +- include/hw/misc/allwinner-sid.h | 4 +- include/hw/misc/arm11scu.h | 3 +- include/hw/misc/armsse-cpuid.h | 3 +- include/hw/misc/armsse-mhu.h | 3 +- include/hw/misc/aspeed_scu.h | 7 +-- include/hw/misc/aspeed_sdmc.h | 7 +-- include/hw/misc/aspeed_xdma.h | 3 +- include/hw/misc/auxbus.h | 10 ++-- include/hw/misc/avr_power.h | 3 +- include/hw/misc/bcm2835_mbox.h | 4 +- include/hw/misc/bcm2835_mphi.h | 4 +- include/hw/misc/bcm2835_property.h | 4 +- include/hw/misc/bcm2835_rng.h | 4 +- include/hw/misc/bcm2835_thermal.h | 4 +- include/hw/misc/grlib_ahb_apb_pnp.h | 8 +-- include/hw/misc/imx25_ccm.h | 3 +- include/hw/misc/imx31_ccm.h | 3 +- include/hw/misc/imx6_ccm.h | 3 +- include/hw/misc/imx6_src.h | 3 +- include/hw/misc/imx6ul_ccm.h | 3 +- include/hw/misc/imx7_ccm.h | 6 ++- include/hw/misc/imx7_gpr.h | 3 +- include/hw/misc/imx7_snvs.h | 3 +- include/hw/misc/imx_rngc.h | 3 +- include/hw/misc/iotkit-secctl.h | 3 +- include/hw/misc/iotkit-sysctl.h | 4 +- include/hw/misc/iotkit-sysinfo.h | 4 +- include/hw/misc/mac_via.h | 11 ++-- include/hw/misc/macio/cuda.h | 7 +-- include/hw/misc/macio/gpio.h | 3 +- include/hw/misc/macio/macio.h | 17 +++--- include/hw/misc/macio/pmu.h | 7 +-- include/hw/misc/max111x.h | 4 +- include/hw/misc/mips_cmgcr.h | 3 +- include/hw/misc/mips_cpc.h | 3 +- include/hw/misc/mips_itu.h | 3 +- include/hw/misc/mps2-fpgaio.h | 3 +- include/hw/misc/mps2-scc.h | 3 +- include/hw/misc/msf2-sysreg.h | 3 +- include/hw/misc/nrf51_rng.h | 3 +- include/hw/misc/pca9552.h | 3 +- include/hw/misc/stm32f2xx_syscfg.h | 4 +- include/hw/misc/stm32f4xx_exti.h | 4 +- include/hw/misc/stm32f4xx_syscfg.h | 4 +- include/hw/misc/tz-mpc.h | 3 +- include/hw/misc/tz-msc.h | 3 +- include/hw/misc/tz-ppc.h | 3 +- include/hw/misc/unimp.h | 4 +- include/hw/misc/vmcoreinfo.h | 3 +- include/hw/misc/zynq-xadc.h | 4 +- include/hw/net/allwinner-sun8i-emac.h | 4 +- include/hw/net/allwinner_emac.h | 3 +- include/hw/net/cadence_gem.h | 3 +- include/hw/net/ftgmac100.h | 6 ++- include/hw/net/imx_fec.h | 3 +- include/hw/net/lance.h | 4 +- include/hw/net/lasi_82596.h | 4 +- include/hw/net/msf2-emac.h | 4 +- include/hw/nmi.h | 6 +-- include/hw/nubus/mac-nubus-bridge.h | 4 +- include/hw/nubus/nubus.h | 7 +-- include/hw/nvram/fw_cfg.h | 15 +++--- include/hw/nvram/nrf51_nvm.h | 3 +- include/hw/or-irq.h | 3 +- include/hw/pci-bridge/simba.h | 4 +- include/hw/pci-host/designware.h | 8 +-- include/hw/pci-host/gpex.h | 8 +-- include/hw/pci-host/i440fx.h | 4 +- include/hw/pci-host/pnv_phb3.h | 9 ++-- include/hw/pci-host/pnv_phb4.h | 15 +++--- include/hw/pci-host/q35.h | 8 +-- include/hw/pci-host/sabre.h | 8 +-- include/hw/pci-host/spapr.h | 4 +- include/hw/pci-host/uninorth.h | 20 +++---- include/hw/pci-host/xilinx-pcie.h | 8 +-- include/hw/pci/pci.h | 13 ++--- include/hw/pci/pci_bridge.h | 3 +- include/hw/pci/pci_host.h | 8 +-- include/hw/pci/pcie_host.h | 4 +- include/hw/pci/pcie_port.h | 12 ++--- include/hw/pcmcia.h | 8 +-- include/hw/platform-bus.h | 4 +- include/hw/ppc/mac_dbdma.h | 3 +- include/hw/ppc/openpic.h | 3 +- include/hw/ppc/pnv.h | 44 +++++++-------- include/hw/ppc/pnv_core.h | 12 ++--- include/hw/ppc/pnv_homer.h | 13 +++-- include/hw/ppc/pnv_lpc.h | 17 +++--- include/hw/ppc/pnv_occ.h | 13 +++-- include/hw/ppc/pnv_pnor.h | 3 +- include/hw/ppc/pnv_psi.h | 16 +++--- include/hw/ppc/pnv_xive.h | 7 +-- include/hw/ppc/pnv_xscom.h | 5 +- include/hw/ppc/spapr.h | 20 +++---- include/hw/ppc/spapr_cpu_core.h | 8 +-- include/hw/ppc/spapr_drc.h | 67 ++++++----------------- include/hw/ppc/spapr_irq.h | 6 +-- include/hw/ppc/spapr_tpm_proxy.h | 4 +- include/hw/ppc/spapr_vio.h | 11 ++-- include/hw/ppc/spapr_xive.h | 7 +-- include/hw/ppc/xics.h | 23 +++----- include/hw/qdev-core.h | 10 ++-- include/hw/register.h | 3 +- include/hw/resettable.h | 6 +-- include/hw/riscv/opentitan.h | 4 +- include/hw/riscv/riscv_hart.h | 4 +- include/hw/riscv/sifive_clint.h | 4 +- include/hw/riscv/sifive_e.h | 8 +-- include/hw/riscv/sifive_e_prci.h | 4 +- include/hw/riscv/sifive_gpio.h | 3 +- include/hw/riscv/sifive_plic.h | 4 +- include/hw/riscv/sifive_test.h | 4 +- include/hw/riscv/sifive_u.h | 8 +-- include/hw/riscv/sifive_u_otp.h | 4 +- include/hw/riscv/sifive_u_prci.h | 4 +- include/hw/riscv/sifive_uart.h | 4 +- include/hw/riscv/virt.h | 4 +- include/hw/rtc/allwinner-rtc.h | 8 +-- include/hw/rtc/aspeed_rtc.h | 3 +- include/hw/rtc/goldfish_rtc.h | 4 +- include/hw/rtc/m48t59.h | 6 +-- include/hw/rtc/mc146818rtc.h | 3 +- include/hw/rtc/pl031.h | 3 +- include/hw/rtc/xlnx-zynqmp-rtc.h | 4 +- include/hw/rx/rx62n.h | 3 +- include/hw/s390x/3270-ccw.h | 8 +-- include/hw/s390x/ap-device.h | 4 +- include/hw/s390x/css-bridge.h | 8 +-- include/hw/s390x/event-facility.h | 18 ++----- include/hw/s390x/s390-ccw.h | 8 +-- include/hw/s390x/s390_flic.h | 16 +++--- include/hw/s390x/sclp.h | 5 +- include/hw/s390x/storage-attributes.h | 16 +++--- include/hw/s390x/storage-keys.h | 12 ++--- include/hw/s390x/tod.h | 7 +-- include/hw/s390x/vfio-ccw.h | 4 +- include/hw/scsi/esp.h | 3 +- include/hw/scsi/scsi.h | 11 ++-- include/hw/sd/allwinner-sdhost.h | 8 +-- include/hw/sd/aspeed_sdhci.h | 4 +- include/hw/sd/bcm2835_sdhost.h | 4 +- include/hw/sd/sd.h | 12 ++--- include/hw/sd/sdhci.h | 7 +-- include/hw/southbridge/piix.h | 4 +- include/hw/sparc/sparc32_dma.h | 16 +++--- include/hw/sparc/sun4m_iommu.h | 3 +- include/hw/sparc/sun4u_iommu.h | 3 +- include/hw/ssi/aspeed_smc.h | 7 +-- include/hw/ssi/imx_spi.h | 3 +- include/hw/ssi/mss-spi.h | 3 +- include/hw/ssi/pl022.h | 3 +- include/hw/ssi/ssi.h | 8 +-- include/hw/ssi/stm32f2xx_spi.h | 4 +- include/hw/ssi/xilinx_spips.h | 20 +++---- include/hw/stream.h | 6 +-- include/hw/sysbus.h | 11 ++-- include/hw/timer/a9gtimer.h | 3 +- include/hw/timer/allwinner-a10-pit.h | 3 +- include/hw/timer/arm_mptimer.h | 4 +- include/hw/timer/armv7m_systick.h | 3 +- include/hw/timer/aspeed_timer.h | 8 +-- include/hw/timer/avr_timer16.h | 4 +- include/hw/timer/bcm2835_systmr.h | 4 +- include/hw/timer/cmsdk-apb-dualtimer.h | 4 +- include/hw/timer/cmsdk-apb-timer.h | 4 +- include/hw/timer/digic-timer.h | 3 +- include/hw/timer/i8254.h | 8 +-- include/hw/timer/imx_epit.h | 3 +- include/hw/timer/imx_gpt.h | 3 +- include/hw/timer/mss-timer.h | 4 +- include/hw/timer/nrf51_timer.h | 3 +- include/hw/timer/renesas_cmt.h | 3 +- include/hw/timer/renesas_tmr.h | 3 +- include/hw/timer/stm32f2xx_timer.h | 4 +- include/hw/usb.h | 11 ++-- include/hw/usb/chipidea.h | 3 +- include/hw/usb/imx-usb-phy.h | 3 +- include/hw/vfio/vfio-amd-xgbe.h | 10 +--- include/hw/vfio/vfio-calxeda-xgmac.h | 10 +--- include/hw/vfio/vfio-platform.h | 8 +-- include/hw/virtio/vhost-scsi-common.h | 4 +- include/hw/virtio/vhost-scsi.h | 4 +- include/hw/virtio/vhost-user-fs.h | 4 +- include/hw/virtio/vhost-user-scsi.h | 4 +- include/hw/virtio/vhost-user-vsock.h | 4 +- include/hw/virtio/vhost-vsock-common.h | 4 +- include/hw/virtio/vhost-vsock.h | 4 +- include/hw/virtio/virtio-balloon.h | 4 +- include/hw/virtio/virtio-blk.h | 4 +- include/hw/virtio/virtio-bus.h | 7 +-- include/hw/virtio/virtio-crypto.h | 4 +- include/hw/virtio/virtio-gpu-pci.h | 4 +- include/hw/virtio/virtio-gpu.h | 16 +++--- include/hw/virtio/virtio-input.h | 20 +++---- include/hw/virtio/virtio-iommu.h | 4 +- include/hw/virtio/virtio-mem.h | 8 +-- include/hw/virtio/virtio-mmio.h | 4 +- include/hw/virtio/virtio-net.h | 4 +- include/hw/virtio/virtio-pmem.h | 8 +-- include/hw/virtio/virtio-rng.h | 4 +- include/hw/virtio/virtio-scsi.h | 8 +-- include/hw/virtio/virtio-serial.h | 16 +++--- include/hw/virtio/virtio.h | 8 +-- include/hw/vmstate-if.h | 6 +-- include/hw/watchdog/cmsdk-apb-watchdog.h | 4 +- include/hw/watchdog/wdt_aspeed.h | 8 +-- include/hw/watchdog/wdt_diag288.h | 8 +-- include/hw/watchdog/wdt_imx2.h | 3 +- include/hw/xen/xen-block.h | 16 +++--- include/hw/xen/xen-bus.h | 16 ++---- include/hw/xen/xen-legacy-backend.h | 4 +- include/io/channel-buffer.h | 4 +- include/io/channel-command.h | 4 +- include/io/channel-file.h | 4 +- include/io/channel-socket.h | 4 +- include/io/channel-tls.h | 4 +- include/io/channel-websock.h | 4 +- include/io/channel.h | 8 +-- include/io/dns-resolver.h | 8 +-- include/io/net-listener.h | 8 +-- include/net/can_emu.h | 4 +- include/net/can_host.h | 8 +-- include/net/filter.h | 8 +-- include/qom/object_interfaces.h | 8 +-- include/scsi/pr-manager.h | 8 +-- include/sysemu/accel.h | 8 +-- include/sysemu/cryptodev.h | 11 +--- include/sysemu/hostmem.h | 8 +-- include/sysemu/hvf.h | 4 +- include/sysemu/iothread.h | 4 +- include/sysemu/kvm.h | 4 +- include/sysemu/rng-random.h | 3 +- include/sysemu/rng.h | 8 +-- include/sysemu/tpm.h | 6 +-- include/sysemu/tpm_backend.h | 8 +-- include/sysemu/vhost-user-backend.h | 8 +-- include/ui/console.h | 8 +-- target/alpha/cpu-qom.h | 8 +-- target/arm/cpu-qom.h | 8 +-- target/arm/idau.h | 6 +-- target/avr/cpu-qom.h | 8 +-- target/cris/cpu-qom.h | 8 +-- target/hppa/cpu-qom.h | 8 +-- target/i386/cpu-qom.h | 8 +-- target/lm32/cpu-qom.h | 8 +-- target/m68k/cpu-qom.h | 8 +-- target/microblaze/cpu-qom.h | 8 +-- target/mips/cpu-qom.h | 8 +-- target/moxie/cpu.h | 8 +-- target/nios2/cpu.h | 8 +-- target/openrisc/cpu.h | 8 +-- target/ppc/cpu-qom.h | 8 +-- target/ppc/cpu.h | 10 +--- target/riscv/cpu.h | 8 +-- target/s390x/cpu-qom.h | 8 +-- target/sh4/cpu-qom.h | 8 +-- target/sparc/cpu-qom.h | 8 +-- target/tilegx/cpu.h | 8 +-- target/tricore/cpu-qom.h | 8 +-- target/unicore32/cpu-qom.h | 8 +-- target/xtensa/cpu-qom.h | 8 +-- accel/tcg/tcg-all.c | 4 +- backends/cryptodev-builtin.c | 5 +- backends/cryptodev-vhost-user.c | 5 +- backends/dbus-vmstate.c | 8 +-- backends/hostmem-file.c | 4 +- backends/hostmem-memfd.c | 4 +- backends/rng-builtin.c | 3 +- backends/rng-egd.c | 3 +- backends/tpm/tpm_emulator.c | 4 +- backends/tpm/tpm_passthrough.c | 4 +- chardev/baum.c | 3 +- chardev/char-parallel.c | 6 +-- chardev/char-pty.c | 3 +- chardev/char-ringbuf.c | 4 +- chardev/char-socket.c | 4 +- chardev/char-udp.c | 3 +- chardev/char-win-stdio.c | 4 +- chardev/msmouse.c | 4 +- chardev/testdev.c | 4 +- chardev/wctablet.c | 4 +- hw/acpi/piix4.c | 4 +- hw/alpha/typhoon.c | 4 +- hw/arm/collie.c | 4 +- hw/arm/highbank.c | 4 +- hw/arm/microbit.c | 4 +- hw/arm/mps2-tz.c | 8 +-- hw/arm/mps2.c | 8 +-- hw/arm/musca.c | 8 +-- hw/arm/musicpal.c | 32 +++++------ hw/arm/palm.c | 4 +- hw/arm/pxa2xx.c | 12 ++--- hw/arm/pxa2xx_gpio.c | 4 +- hw/arm/pxa2xx_pic.c | 4 +- hw/arm/raspi.c | 8 +-- hw/arm/sbsa-ref.c | 4 +- hw/arm/spitz.c | 25 +++++---- hw/arm/stellaris.c | 12 ++--- hw/arm/strongarm.c | 24 ++++----- hw/arm/tosa.c | 7 +-- hw/arm/vexpress.c | 8 +-- hw/arm/xilinx_zynq.c | 4 +- hw/arm/xlnx-versal-virt.c | 4 +- hw/arm/xlnx-zcu102.c | 4 +- hw/arm/z2.c | 6 ++- hw/audio/ac97.c | 4 +- hw/audio/adlib.c | 3 +- hw/audio/cs4231.c | 4 +- hw/audio/cs4231a.c | 3 +- hw/audio/es1370.c | 4 +- hw/audio/gus.c | 3 +- hw/audio/hda-codec.c | 3 +- hw/audio/intel-hda.c | 4 +- hw/audio/marvell_88w8618.c | 4 +- hw/audio/milkymist-ac97.c | 4 +- hw/audio/pcspk.c | 3 +- hw/audio/pl041.c | 3 +- hw/audio/sb16.c | 3 +- hw/audio/wm8750.c | 3 +- hw/avr/arduino.c | 8 +-- hw/avr/atmega.c | 6 +-- hw/block/fdc.c | 13 +++-- hw/block/m25p80.c | 8 +-- hw/block/nand.c | 4 +- hw/block/onenand.c | 3 +- hw/char/debugcon.c | 4 +- hw/char/etraxfs_ser.c | 4 +- hw/char/exynos4210_uart.c | 4 +- hw/char/grlib_apbuart.c | 4 +- hw/char/ipoctal232.c | 4 +- hw/char/lm32_juart.c | 3 +- hw/char/lm32_uart.c | 3 +- hw/char/mcf_uart.c | 3 +- hw/char/milkymist-uart.c | 4 +- hw/char/parallel.c | 4 +- hw/char/sclpconsole-lm.c | 4 +- hw/char/sclpconsole.c | 4 +- hw/char/serial-isa.c | 3 +- hw/char/serial-pci.c | 3 +- hw/char/spapr_vty.c | 4 +- hw/char/terminal3270.c | 4 +- hw/char/virtio-console.c | 4 +- hw/char/xilinx_uartlite.c | 4 +- hw/core/irq.c | 3 +- hw/cpu/realview_mpcore.c | 4 +- hw/display/ads7846.c | 3 +- hw/display/artist.c | 3 +- hw/display/bochs-display.c | 4 +- hw/display/cg3.c | 3 +- hw/display/cirrus_vga.c | 4 +- hw/display/cirrus_vga_isa.c | 4 +- hw/display/exynos4210_fimd.c | 4 +- hw/display/g364fb.c | 3 +- hw/display/jazz_led.c | 3 +- hw/display/milkymist-tmu2.c | 4 +- hw/display/milkymist-vgafb.c | 4 +- hw/display/next-fb.c | 3 +- hw/display/pl110.c | 3 +- hw/display/ramfb-standalone.c | 3 +- hw/display/sii9022.c | 3 +- hw/display/sm501.c | 7 +-- hw/display/ssd0303.c | 3 +- hw/display/ssd0323.c | 3 +- hw/display/tcx.c | 3 +- hw/display/vga-isa.c | 3 +- hw/display/vga-pci.c | 3 +- hw/display/vhost-user-gpu-pci.c | 4 +- hw/display/vhost-user-vga.c | 4 +- hw/display/virtio-gpu-pci.c | 4 +- hw/display/virtio-vga.c | 4 +- hw/display/vmware_vga.c | 4 +- hw/dma/i82374.c | 3 +- hw/dma/pl330.c | 3 +- hw/dma/puv3_dma.c | 3 +- hw/dma/pxa2xx_dma.c | 3 +- hw/dma/rc4030.c | 4 +- hw/dma/xilinx_axidma.c | 14 +++-- hw/gpio/gpio_key.c | 3 +- hw/gpio/max7310.c | 3 +- hw/gpio/mpc8xxx.c | 3 +- hw/gpio/pl061.c | 3 +- hw/gpio/puv3_gpio.c | 3 +- hw/gpio/zaurus.c | 3 +- hw/hppa/dino.c | 4 +- hw/hyperv/hyperv.c | 3 +- hw/hyperv/hyperv_testdev.c | 4 +- hw/i2c/bitbang_i2c.c | 3 +- hw/i2c/exynos4210_i2c.c | 4 +- hw/i2c/mpc_i2c.c | 4 +- hw/i2c/smbus_eeprom.c | 4 +- hw/i2c/smbus_ich9.c | 4 +- hw/i2c/versatile_i2c.c | 4 +- hw/i386/kvm/clock.c | 3 +- hw/i386/kvm/i8254.c | 7 +-- hw/i386/kvm/i8259.c | 6 +-- hw/i386/kvmvapic.c | 3 +- hw/i386/port92.c | 3 +- hw/i386/vmmouse.c | 3 +- hw/i386/vmport.c | 3 +- hw/i386/xen/xen_platform.c | 4 +- hw/i386/xen/xen_pvdevice.c | 4 +- hw/ide/isa.c | 3 +- hw/ide/microdrive.c | 3 +- hw/ide/mmio.c | 3 +- hw/ide/sii3112.c | 2 +- hw/input/adb-kbd.c | 7 +-- hw/input/adb-mouse.c | 7 +-- hw/input/lm832x.c | 3 +- hw/input/milkymist-softusb.c | 4 +- hw/input/pl050.c | 3 +- hw/intc/arm_gicv2m.c | 3 +- hw/intc/etraxfs_pic.c | 4 +- hw/intc/exynos4210_combiner.c | 4 +- hw/intc/exynos4210_gic.c | 8 +-- hw/intc/grlib_irqmp.c | 3 +- hw/intc/i8259.c | 4 +- hw/intc/lm32_pic.c | 3 +- hw/intc/loongson_liointc.c | 4 +- hw/intc/nios2_iic.c | 4 +- hw/intc/ompic.c | 3 +- hw/intc/openpic_kvm.c | 4 +- hw/intc/pl190.c | 3 +- hw/intc/puv3_intc.c | 3 +- hw/intc/s390_flic_kvm.c | 6 +-- hw/intc/slavio_intctl.c | 4 +- hw/intc/xilinx_intc.c | 3 +- hw/ipack/tpci200.c | 4 +- hw/ipmi/ipmi_bmc_extern.c | 4 +- hw/ipmi/isa_ipmi_bt.c | 4 +- hw/ipmi/isa_ipmi_kcs.c | 4 +- hw/ipmi/pci_ipmi_bt.c | 4 +- hw/ipmi/pci_ipmi_kcs.c | 4 +- hw/ipmi/smbus_ipmi.c | 3 +- hw/isa/i82378.c | 4 +- hw/isa/piix4.c | 4 +- hw/isa/vt82c686.c | 16 +++--- hw/m68k/mcf_intc.c | 3 +- hw/m68k/next-cube.c | 3 +- hw/m68k/next-kbd.c | 3 +- hw/microblaze/xlnx-zynqmp-pmu.c | 4 +- hw/mips/boston.c | 3 +- hw/mips/gt64xxx_pci.c | 4 +- hw/mips/malta.c | 3 +- hw/misc/applesmc.c | 3 +- hw/misc/arm_integrator_debug.c | 4 +- hw/misc/arm_l2x0.c | 3 +- hw/misc/arm_sysctl.c | 4 +- hw/misc/debugexit.c | 4 +- hw/misc/eccmemctl.c | 3 +- hw/misc/edu.c | 3 +- hw/misc/empty_slot.c | 3 +- hw/misc/exynos4210_clk.c | 4 +- hw/misc/exynos4210_pmu.c | 4 +- hw/misc/exynos4210_rng.c | 4 +- hw/misc/ivshmem.c | 16 +++--- hw/misc/milkymist-hpdmc.c | 4 +- hw/misc/milkymist-pfpu.c | 4 +- hw/misc/mst_fpga.c | 4 +- hw/misc/pc-testdev.c | 4 +- hw/misc/pca9552.c | 6 +-- hw/misc/pci-testdev.c | 4 +- hw/misc/puv3_pm.c | 3 +- hw/misc/pvpanic.c | 4 +- hw/misc/sga.c | 3 +- hw/misc/slavio_misc.c | 6 ++- hw/misc/tmp421.c | 7 +-- hw/misc/zynq_slcr.c | 3 +- hw/net/can/can_kvaser_pci.c | 4 +- hw/net/can/can_mioe3680_pci.c | 4 +- hw/net/can/can_pcm3680_pci.c | 4 +- hw/net/dp8393x.c | 3 +- hw/net/e1000.c | 8 +-- hw/net/e1000e.c | 3 +- hw/net/etraxfs_eth.c | 4 +- hw/net/lan9118.c | 3 +- hw/net/milkymist-minimac2.c | 4 +- hw/net/mipsnet.c | 3 +- hw/net/ne2000-isa.c | 3 +- hw/net/opencores_eth.c | 3 +- hw/net/pcnet-pci.c | 4 +- hw/net/rtl8139.c | 4 +- hw/net/smc91c111.c | 3 +- hw/net/spapr_llan.c | 4 +- hw/net/stellaris_enet.c | 4 +- hw/net/sungem.c | 3 +- hw/net/sunhme.c | 3 +- hw/net/vmxnet3.c | 6 +-- hw/net/xgmac.c | 3 +- hw/net/xilinx_axienet.c | 14 +++-- hw/net/xilinx_ethlite.c | 4 +- hw/nvram/ds1225y.c | 3 +- hw/nvram/eeprom_at24c.c | 3 +- hw/nvram/spapr_nvram.c | 4 +- hw/pci-bridge/dec.c | 3 +- hw/pci-bridge/gen_pcie_root_port.c | 4 +- hw/pci-bridge/pci_bridge_dev.c | 4 +- hw/pci-bridge/pci_expander_bridge.c | 12 +++-- hw/pci-bridge/pcie_pci_bridge.c | 4 +- hw/pci-host/bonito.c | 8 +-- hw/pci-host/grackle.c | 4 +- hw/pci-host/i440fx.c | 4 +- hw/pci-host/pnv_phb3.c | 4 +- hw/pci-host/pnv_phb4.c | 4 +- hw/pci-host/ppce500.c | 8 +-- hw/pci-host/prep.c | 8 +-- hw/pci-host/versatile.c | 8 +-- hw/ppc/mpc8544_guts.c | 3 +- hw/ppc/ppc440_pcix.c | 4 +- hw/ppc/ppc440_uc.c | 4 +- hw/ppc/ppc4xx_pci.c | 4 +- hw/ppc/ppce500_spin.c | 3 +- hw/ppc/prep_systemio.c | 4 +- hw/ppc/rs6000_mc.c | 4 +- hw/ppc/spapr_rng.c | 4 +- hw/rtc/ds1338.c | 3 +- hw/rtc/exynos4210_rtc.c | 4 +- hw/rtc/m41t80.c | 3 +- hw/rtc/m48t59-isa.c | 8 +-- hw/rtc/m48t59.c | 8 +-- hw/rtc/sun4v-rtc.c | 3 +- hw/rtc/twl92230.c | 3 +- hw/rx/rx-gdbsim.c | 8 +-- hw/rx/rx62n.c | 6 +-- hw/scsi/esp-pci.c | 8 +-- hw/scsi/lsi53c895a.c | 4 +- hw/scsi/megasas.c | 8 +-- hw/scsi/scsi-disk.c | 8 +-- hw/scsi/spapr_vscsi.c | 4 +- hw/scsi/vmw_pvscsi.c | 7 +-- hw/sd/milkymist-memcard.c | 4 +- hw/sd/ssi-sd.c | 3 +- hw/sh4/sh_pci.c | 4 +- hw/sparc/sun4m.c | 13 +++-- hw/sparc64/sun4u.c | 12 +++-- hw/ssi/ssi.c | 3 +- hw/ssi/xilinx_spi.c | 3 +- hw/timer/altera_timer.c | 4 +- hw/timer/arm_timer.c | 7 +-- hw/timer/cadence_ttc.c | 4 +- hw/timer/etraxfs_timer.c | 4 +- hw/timer/exynos4210_mct.c | 4 +- hw/timer/exynos4210_pwm.c | 4 +- hw/timer/grlib_gptimer.c | 4 +- hw/timer/hpet.c | 3 +- hw/timer/i8254.c | 4 +- hw/timer/lm32_timer.c | 3 +- hw/timer/milkymist-sysctl.c | 4 +- hw/timer/puv3_ost.c | 3 +- hw/timer/pxa2xx_timer.c | 4 +- hw/timer/slavio_timer.c | 4 +- hw/timer/xilinx_timer.c | 4 +- hw/tpm/tpm_crb.c | 3 +- hw/tpm/tpm_spapr.c | 4 +- hw/tpm/tpm_tis_isa.c | 3 +- hw/tpm/tpm_tis_sysbus.c | 3 +- hw/usb/ccid-card-emulated.c | 4 +- hw/usb/ccid-card-passthru.c | 4 +- hw/usb/dev-audio.c | 3 +- hw/usb/dev-hid.c | 3 +- hw/usb/dev-hub.c | 3 +- hw/usb/dev-mtp.c | 3 +- hw/usb/dev-network.c | 3 +- hw/usb/dev-serial.c | 3 +- hw/usb/dev-smartcard-reader.c | 6 ++- hw/usb/dev-storage.c | 3 +- hw/usb/dev-uas.c | 3 +- hw/usb/dev-wacom.c | 3 +- hw/usb/hcd-ohci-pci.c | 3 +- hw/usb/hcd-uhci.c | 3 +- hw/usb/host-libusb.c | 4 +- hw/usb/redirect.c | 3 +- hw/usb/tusb6010.c | 3 +- hw/vfio/ap.c | 4 +- hw/virtio/vhost-scsi-pci.c | 4 +- hw/virtio/vhost-user-blk-pci.c | 4 +- hw/virtio/vhost-user-fs-pci.c | 4 +- hw/virtio/vhost-user-input-pci.c | 4 +- hw/virtio/vhost-user-scsi-pci.c | 4 +- hw/virtio/vhost-user-vsock-pci.c | 4 +- hw/virtio/vhost-vsock-pci.c | 4 +- hw/virtio/virtio-9p-pci.c | 4 +- hw/virtio/virtio-balloon-pci.c | 4 +- hw/virtio/virtio-blk-pci.c | 4 +- hw/virtio/virtio-crypto-pci.c | 4 +- hw/virtio/virtio-input-host-pci.c | 4 +- hw/virtio/virtio-input-pci.c | 8 +-- hw/virtio/virtio-iommu-pci.c | 4 +- hw/virtio/virtio-net-pci.c | 4 +- hw/virtio/virtio-rng-pci.c | 4 +- hw/virtio/virtio-scsi-pci.c | 4 +- hw/virtio/virtio-serial-pci.c | 4 +- hw/watchdog/wdt_i6300esb.c | 4 +- hw/watchdog/wdt_ib700.c | 3 +- iothread.c | 6 +-- migration/rdma.c | 4 +- net/can/can_socketcan.c | 4 +- net/colo-compare.c | 4 +- net/dump.c | 4 +- net/filter-buffer.c | 4 +- net/filter-mirror.c | 8 +-- net/filter-replay.c | 4 +- net/filter-rewriter.c | 4 +- scsi/pr-manager-helper.c | 5 +- target/i386/sev.c | 4 +- tests/check-qom-interface.c | 6 +-- tests/check-qom-proplist.c | 16 +++--- tests/test-qdev-global-props.c | 8 +-- ui/console.c | 3 +- ui/gtk.c | 3 +- ui/input-barrier.c | 8 +-- ui/input-linux.c | 8 +-- ui/spice-app.c | 3 +- 791 files changed, 1986 insertions(+), 2425 deletions(-)
chardev/chardev-internal.h +2 -1
@@ -54,7 +54,8 @@ struct MuxChardev { };typedef struct MuxChardev MuxChardev ; -#define MUX_CHARDEV (obj) OBJECT_CHECK(MuxChardev, (obj), TYPE_CHARDEV_MUX) +DECLARE_INSTANCE_CHECKER (MuxChardev,MUX_CHARDEV , + TYPE_CHARDEV_MUX)#define CHARDEV_IS_MUX (chr) \ object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX)
hw/9pfs/virtio-9p.h +2 -2
@@ -16,7 +16,7 @@ struct V9fsVirtioState {typedef struct V9fsVirtioState V9fsVirtioState ;#define TYPE_VIRTIO_9P "virtio-9p-device" -#define VIRTIO_9P (obj) \ - OBJECT_CHECK(V9fsVirtioState, (obj), TYPE_VIRTIO_9P) +DECLARE_INSTANCE_CHECKER (V9fsVirtioState,VIRTIO_9P , + TYPE_VIRTIO_9P)#endif
hw/audio/intel-hda.h +4 -7
@@ -10,16 +10,13 @@#define TYPE_HDA_CODEC_DEVICE "hda-codec"typedef struct HDACodecDevice HDACodecDevice ;typedef struct HDACodecDeviceClass HDACodecDeviceClass ; -#define HDA_CODEC_DEVICE (obj) \ - OBJECT_CHECK(HDACodecDevice, (obj), TYPE_HDA_CODEC_DEVICE) -#define HDA_CODEC_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(HDACodecDeviceClass, (klass), TYPE_HDA_CODEC_DEVICE) -#define HDA_CODEC_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(HDACodecDeviceClass, (obj), TYPE_HDA_CODEC_DEVICE) +DECLARE_OBJ_CHECKERS (HDACodecDevice, HDACodecDeviceClass, + HDA_CODEC_DEVICE, TYPE_HDA_CODEC_DEVICE)#define TYPE_HDA_BUS "HDA"typedef struct HDACodecBus HDACodecBus ; -#define HDA_BUS (obj) OBJECT_CHECK(HDACodecBus, (obj), TYPE_HDA_BUS) +DECLARE_INSTANCE_CHECKER (HDACodecBus,HDA_BUS , + TYPE_HDA_BUS) typedef void (*hda_codec_response_func)(HDACodecDevice *dev,
hw/avr/atmega.h +2 -1
@@ -24,7 +24,8 @@#define TYPE_ATMEGA2560_MCU "ATmega2560"typedef struct AtmegaMcuState AtmegaMcuState ; -#define ATMEGA_MCU (obj) OBJECT_CHECK(AtmegaMcuState, (obj), TYPE_ATMEGA_MCU) +DECLARE_INSTANCE_CHECKER (AtmegaMcuState,ATMEGA_MCU , + TYPE_ATMEGA_MCU)#define POWER_MAX 2#define USART_MAX 4
hw/block/nvme.h +2 -2
@@ -76,8 +76,8 @@ static inline uint8_t nvme_ns_lbads(NvmeNamespace *ns)#define TYPE_NVME "nvme"typedef struct NvmeCtrl NvmeCtrl ; -#define NVME (obj) \ - OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME) +DECLARE_INSTANCE_CHECKER (NvmeCtrl,NVME , + TYPE_NVME)struct NvmeCtrl {PCIDevice parent_obj;
hw/display/ati_int.h +2 -1
@@ -31,7 +31,8 @@#define TYPE_ATI_VGA "ati-vga"typedef struct ATIVGAState ATIVGAState ; -#define ATI_VGA (obj) OBJECT_CHECK(ATIVGAState, (obj), TYPE_ATI_VGA) +DECLARE_INSTANCE_CHECKER (ATIVGAState,ATI_VGA , + TYPE_ATI_VGA) typedef struct ATIVGARegs { uint32_t mm_index;
hw/display/qxl.h +2 -1
@@ -131,7 +131,8 @@ struct PCIQXLDevice {typedef struct PCIQXLDevice PCIQXLDevice ;#define TYPE_PCI_QXL "pci-qxl" -#define PCI_QXL (obj) OBJECT_CHECK(PCIQXLDevice, (obj), TYPE_PCI_QXL) +DECLARE_INSTANCE_CHECKER (PCIQXLDevice,PCI_QXL , + TYPE_PCI_QXL)#define PANIC_ON (x) if ((x)) { \ printf("%s: PANIC %s failed\n", __func__, #x); \
hw/display/virtio-vga.h +2 -6
@@ -11,12 +11,8 @@#define TYPE_VIRTIO_VGA_BASE "virtio-vga-base"typedef struct VirtIOVGABase VirtIOVGABase ;typedef struct VirtIOVGABaseClass VirtIOVGABaseClass ; -#define VIRTIO_VGA_BASE (obj) \ - OBJECT_CHECK(VirtIOVGABase, (obj), TYPE_VIRTIO_VGA_BASE) -#define VIRTIO_VGA_BASE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(VirtIOVGABaseClass, obj, TYPE_VIRTIO_VGA_BASE) -#define VIRTIO_VGA_BASE_CLASS (klass) \ - OBJECT_CLASS_CHECK(VirtIOVGABaseClass, klass, TYPE_VIRTIO_VGA_BASE) +DECLARE_OBJ_CHECKERS (VirtIOVGABase, VirtIOVGABaseClass, + VIRTIO_VGA_BASE, TYPE_VIRTIO_VGA_BASE)struct VirtIOVGABase {VirtIOPCIProxy parent_obj;
hw/i386/amd_iommu.h +2 -2
@@ -298,8 +298,8 @@ struct irte_ga {#define TYPE_AMD_IOMMU_DEVICE "amd-iommu"typedef struct AMDVIState AMDVIState ; -#define AMD_IOMMU_DEVICE (obj)\ - OBJECT_CHECK(AMDVIState, (obj), TYPE_AMD_IOMMU_DEVICE) +DECLARE_INSTANCE_CHECKER (AMDVIState,AMD_IOMMU_DEVICE , + TYPE_AMD_IOMMU_DEVICE)#define TYPE_AMD_IOMMU_PCI "AMDVI-PCI"
hw/misc/tmp105.h +2 -1
@@ -20,7 +20,8 @@#define TYPE_TMP105 "tmp105"typedef struct TMP105State TMP105State ; -#define TMP105 (obj) OBJECT_CHECK(TMP105State, (obj), TYPE_TMP105) +DECLARE_INSTANCE_CHECKER (TMP105State,TMP105 , +TYPE_TMP105 )/** * TMP105State:
hw/net/fsl_etsec/etsec.h +2 -2
@@ -150,8 +150,8 @@ struct eTSEC {typedef struct eTSEC eTSEC ;#define TYPE_ETSEC_COMMON "eTSEC" -#define ETSEC_COMMON (obj) \ - OBJECT_CHECK(eTSEC, (obj), TYPE_ETSEC_COMMON) +DECLARE_INSTANCE_CHECKER (eTSEC,ETSEC_COMMON , + TYPE_ETSEC_COMMON)#define eTSEC_TRANSMIT 1#define eTSEC_RECEIVE 2
hw/net/rocker/rocker.h +2 -2
@@ -73,8 +73,8 @@ typedef struct desc_ring DescRing;#define TYPE_ROCKER "rocker"typedef struct rocker Rocker ; -#define ROCKER (obj) \ - OBJECT_CHECK(Rocker, (obj), TYPE_ROCKER) +DECLARE_INSTANCE_CHECKER (Rocker,ROCKER , + TYPE_ROCKER)Rocker *rocker_find (const char *name);uint32_t rocker_fp_ports (Rocker *r);
hw/net/tulip.h +2 -1
@@ -7,7 +7,8 @@#define TYPE_TULIP "tulip"typedef struct TULIPState TULIPState ; -#define TULIP (obj) OBJECT_CHECK(TULIPState, (obj), TYPE_TULIP) +DECLARE_INSTANCE_CHECKER (TULIPState,TULIP , + TYPE_TULIP)#define CSR (_x) ((_x) << 3)
hw/net/vmxnet3_defs.h +2 -1
@@ -23,7 +23,8 @@#define TYPE_VMXNET3 "vmxnet3"typedef struct VMXNET3State VMXNET3State ; -#define VMXNET3 (obj) OBJECT_CHECK(VMXNET3State, (obj), TYPE_VMXNET3) +DECLARE_INSTANCE_CHECKER (VMXNET3State,VMXNET3 , +TYPE_VMXNET3 ) /* Device state and helper functions */#define VMXNET3_RX_RINGS_PER_QUEUE (2)
hw/ppc/e500-ccsr.h +2 -1
@@ -14,6 +14,7 @@ struct PPCE500CCSRState {typedef struct PPCE500CCSRState PPCE500CCSRState ;#define TYPE_CCSR "e500-ccsr" -#define CCSR (obj) OBJECT_CHECK(PPCE500CCSRState, (obj), TYPE_CCSR) +DECLARE_INSTANCE_CHECKER (PPCE500CCSRState,CCSR , + TYPE_CCSR)#endif /* E500_CCSR_H */
hw/ppc/e500.h +2 -6
@@ -46,11 +46,7 @@ void ppce500_init(MachineState *machine);hwaddr booke206_page_size_to_tlb (uint64_t size);#define TYPE_PPCE500_MACHINE "ppce500-base-machine" -#define PPCE500_MACHINE (obj) \ - OBJECT_CHECK(PPCE500MachineState, (obj), TYPE_PPCE500_MACHINE) -#define PPCE500_MACHINE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(PPCE500MachineClass, obj, TYPE_PPCE500_MACHINE) -#define PPCE500_MACHINE_CLASS (klass) \ - OBJECT_CLASS_CHECK(PPCE500MachineClass, klass, TYPE_PPCE500_MACHINE) +DECLARE_OBJ_CHECKERS (PPCE500MachineState, PPCE500MachineClass, + PPCE500_MACHINE, TYPE_PPCE500_MACHINE)#endif
hw/ppc/mac.h +4 -4
@@ -73,8 +73,8 @@/* Core99 machine */ #define TYPE_CORE99_MACHINE MACHINE_TYPE_NAME("mac99")typedef struct Core99MachineState Core99MachineState ; -#define CORE99_MACHINE (obj) OBJECT_CHECK(Core99MachineState, (obj), \ - TYPE_CORE99_MACHINE) +DECLARE_INSTANCE_CHECKER (Core99MachineState,CORE99_MACHINE , + TYPE_CORE99_MACHINE)#define CORE99_VIA_CONFIG_CUDA 0x0#define CORE99_VIA_CONFIG_PMU 0x1
@@ -93,8 +93,8 @@ struct Core99MachineState {/* Mac NVRAM */ #define TYPE_MACIO_NVRAM "macio-nvram"typedef struct MacIONVRAMState MacIONVRAMState ; -#define MACIO_NVRAM (obj) \ - OBJECT_CHECK(MacIONVRAMState, (obj), TYPE_MACIO_NVRAM) +DECLARE_INSTANCE_CHECKER (MacIONVRAMState,MACIO_NVRAM , + TYPE_MACIO_NVRAM)struct MacIONVRAMState {/*< private >*/
hw/rdma/vmw/pvrdma.h +2 -1
@@ -101,7 +101,8 @@ struct PVRDMADev {PVRDMADevStats stats; };typedef struct PVRDMADev PVRDMADev ; -#define PVRDMA_DEV (dev) OBJECT_CHECK(PVRDMADev, (dev), PVRDMA_HW_NAME) +DECLARE_INSTANCE_CHECKER (PVRDMADev,PVRDMA_DEV , + PVRDMA_HW_NAME)static inline int get_reg_val (PVRDMADev *dev,hwaddr addr,uint32_t *val) {
hw/s390x/ccw-device.h +2 -5
@@ -47,10 +47,7 @@ static inline CcwDevice *to_ccw_dev_fast(DeviceState *d)#define TYPE_CCW_DEVICE "ccw-device" -#define CCW_DEVICE (obj) OBJECT_CHECK(CcwDevice, (obj), TYPE_CCW_DEVICE) -#define CCW_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(CCWDeviceClass, (obj), TYPE_CCW_DEVICE) -#define CCW_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(CCWDeviceClass, (klass), TYPE_CCW_DEVICE) +DECLARE_OBJ_CHECKERS (CcwDevice, CCWDeviceClass, + CCW_DEVICE, TYPE_CCW_DEVICE)#endif
hw/s390x/ipl.h +2 -1
@@ -154,7 +154,8 @@ typedef struct QemuIplParameters QemuIplParameters;#define TYPE_S390_IPL "s390-ipl"typedef struct S390IPLState S390IPLState ; -#define S390_IPL (obj) OBJECT_CHECK(S390IPLState, (obj), TYPE_S390_IPL) +DECLARE_INSTANCE_CHECKER (S390IPLState,S390_IPL , + TYPE_S390_IPL)struct S390IPLState {/*< private >*/
hw/s390x/s390-pci-bus.h +8 -8
@@ -38,17 +38,17 @@#define UID_CHECKING_ENABLED 0x01typedef struct S390pciState S390pciState ; -#define S390_PCI_HOST_BRIDGE (obj) \ - OBJECT_CHECK(S390pciState, (obj), TYPE_S390_PCI_HOST_BRIDGE) +DECLARE_INSTANCE_CHECKER (S390pciState,S390_PCI_HOST_BRIDGE , + TYPE_S390_PCI_HOST_BRIDGE)typedef struct S390PCIBus S390PCIBus ; -#define S390_PCI_BUS (obj) \ - OBJECT_CHECK(S390PCIBus, (obj), TYPE_S390_PCI_BUS) +DECLARE_INSTANCE_CHECKER (S390PCIBus,S390_PCI_BUS , + TYPE_S390_PCI_BUS)typedef struct S390PCIBusDevice S390PCIBusDevice ; -#define S390_PCI_DEVICE (obj) \ - OBJECT_CHECK(S390PCIBusDevice, (obj), TYPE_S390_PCI_DEVICE) +DECLARE_INSTANCE_CHECKER (S390PCIBusDevice,S390_PCI_DEVICE , + TYPE_S390_PCI_DEVICE)typedef struct S390PCIIOMMU S390PCIIOMMU ; -#define S390_PCI_IOMMU (obj) \ - OBJECT_CHECK(S390PCIIOMMU, (obj), TYPE_S390_PCI_IOMMU) +DECLARE_INSTANCE_CHECKER (S390PCIIOMMU ,S390_PCI_IOMMU , + TYPE_S390_PCI_IOMMU)#define HP_EVENT_TO_CONFIGURED 0x0301#define HP_EVENT_RESERVED_TO_STANDBY 0x0302
hw/s390x/virtio-ccw.h +30 -38
157 lines not on this page · raw message
hw/scsi/mptsas.h +2 -2
@@ -16,8 +16,8 @@ typedef struct MPTSASRequest MPTSASRequest;#define TYPE_MPTSAS1068 "mptsas1068"typedef struct MPTSASState MPTSASState ; -#define MPT_SAS (obj) \ - OBJECT_CHECK(MPTSASState, (obj), TYPE_MPTSAS1068) +DECLARE_INSTANCE_CHECKER (MPTSASState,MPT_SAS , + TYPE_MPTSAS1068)enum {DOORBELL_NONE ,
hw/usb/ccid.h +2 -6
@@ -18,12 +18,8 @@ typedef struct CCIDCardInfo CCIDCardInfo;#define TYPE_CCID_CARD "ccid-card"typedef struct CCIDCardClass CCIDCardClass ; -#define CCID_CARD (obj) \ - OBJECT_CHECK(CCIDCardState, (obj), TYPE_CCID_CARD) -#define CCID_CARD_CLASS (klass) \ - OBJECT_CLASS_CHECK(CCIDCardClass, (klass), TYPE_CCID_CARD) -#define CCID_CARD_GET_CLASS (obj) \ - OBJECT_GET_CLASS(CCIDCardClass, (obj), TYPE_CCID_CARD) +DECLARE_OBJ_CHECKERS (CCIDCardState, CCIDCardClass, +CCID_CARD ,TYPE_CCID_CARD )/* * callbacks to be used by the CCID device (hw/usb-ccid.c) to call
hw/usb/hcd-dwc2.h +2 -6
@@ -181,11 +181,7 @@ struct DWC2Class { }; #define TYPE_DWC2_USB "dwc2-usb" -#define DWC2_USB (obj) \ - OBJECT_CHECK(DWC2State, (obj), TYPE_DWC2_USB) -#define DWC2_USB_CLASS (klass) \ - OBJECT_CLASS_CHECK(DWC2Class, (klass), TYPE_DWC2_USB) -#define DWC2_USB_GET_CLASS (obj) \ - OBJECT_GET_CLASS(DWC2Class, (obj), TYPE_DWC2_USB) +DECLARE_OBJ_CHECKERS(DWC2State, DWC2Class, + DWC2_USB, TYPE_DWC2_USB)#endif
hw/usb/hcd-ehci.h +6 -9
@@ -330,7 +330,8 @@ void ehci_reset(void *opaque);#define TYPE_PCI_EHCI "pci-ehci-usb"typedef struct EHCIPCIState EHCIPCIState ; -#define PCI_EHCI (obj) OBJECT_CHECK(EHCIPCIState, (obj), TYPE_PCI_EHCI) +DECLARE_INSTANCE_CHECKER (EHCIPCIState,PCI_EHCI , + TYPE_PCI_EHCI)struct EHCIPCIState {/*< private >*/
@@ -351,12 +352,8 @@ struct EHCIPCIState {typedef struct EHCISysBusState EHCISysBusState ;typedef struct SysBusEHCIClass SysBusEHCIClass ; -#define SYS_BUS_EHCI (obj) \ - OBJECT_CHECK(EHCISysBusState, (obj), TYPE_SYS_BUS_EHCI) -#define SYS_BUS_EHCI_CLASS (class) \ - OBJECT_CLASS_CHECK(SysBusEHCIClass, (class), TYPE_SYS_BUS_EHCI) -#define SYS_BUS_EHCI_GET_CLASS (obj) \ - OBJECT_GET_CLASS(SysBusEHCIClass, (obj), TYPE_SYS_BUS_EHCI) +DECLARE_OBJ_CHECKERS (EHCISysBusState, SysBusEHCIClass, + SYS_BUS_EHCI, TYPE_SYS_BUS_EHCI)struct EHCISysBusState {/*< private >*/
@@ -378,8 +375,8 @@ struct SysBusEHCIClass { };typedef struct FUSBH200EHCIState FUSBH200EHCIState ; -#define FUSBH200_EHCI (obj) \ - OBJECT_CHECK(FUSBH200EHCIState, (obj), TYPE_FUSBH200_EHCI) +DECLARE_INSTANCE_CHECKER (FUSBH200EHCIState,FUSBH200_EHCI , + TYPE_FUSBH200_EHCI)struct FUSBH200EHCIState {/*< private >*/
hw/usb/hcd-ohci.h +2 -1
@@ -94,7 +94,8 @@ typedef struct OHCIState {#define TYPE_SYSBUS_OHCI "sysbus-ohci"typedef struct OHCISysBusState OHCISysBusState ; -#define SYSBUS_OHCI (obj) OBJECT_CHECK(OHCISysBusState, (obj), TYPE_SYSBUS_OHCI) +DECLARE_INSTANCE_CHECKER (OHCISysBusState,SYSBUS_OHCI , + TYPE_SYSBUS_OHCI)struct OHCISysBusState {/*< private >*/
hw/usb/hcd-xhci.h +2 -2
@@ -28,8 +28,8 @@#define TYPE_QEMU_XHCI "qemu-xhci"typedef struct XHCIState XHCIState ; -#define XHCI (obj) \ - OBJECT_CHECK(XHCIState, (obj), TYPE_XHCI) +DECLARE_INSTANCE_CHECKER (XHCIState,XHCI , + TYPE_XHCI)#define MAXPORTS_2 15#define MAXPORTS_3 15
hw/vfio/pci.h +2 -1
@@ -116,7 +116,8 @@ typedef struct VFIOMSIXInfo {#define TYPE_VFIO_PCI "vfio-pci"typedef struct VFIOPCIDevice VFIOPCIDevice ; -#define PCI_VFIO (obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI) +DECLARE_INSTANCE_CHECKER (VFIOPCIDevice,PCI_VFIO , + TYPE_VFIO_PCI)struct VFIOPCIDevice {PCIDevice pdev;
hw/virtio/virtio-mem-pci.h +2 -2
@@ -23,8 +23,8 @@ typedef struct VirtIOMEMPCI VirtIOMEMPCI;* virtio-mem-pci: This extends VirtioPCIProxy. */ #define TYPE_VIRTIO_MEM_PCI "virtio-mem-pci-base" -#define VIRTIO_MEM_PCI (obj) \ - OBJECT_CHECK(VirtIOMEMPCI, (obj), TYPE_VIRTIO_MEM_PCI) +DECLARE_INSTANCE_CHECKER (VirtIOMEMPCI,VIRTIO_MEM_PCI , + TYPE_VIRTIO_MEM_PCI)struct VirtIOMEMPCI {VirtIOPCIProxy parent_obj;
hw/virtio/virtio-pci.h +4 -12
@@ -27,12 +27,8 @@ typedef struct VirtioBusState VirtioPCIBusState;typedef struct VirtioBusClass VirtioPCIBusClass ;#define TYPE_VIRTIO_PCI_BUS "virtio-pci-bus" -#define VIRTIO_PCI_BUS (obj) \ - OBJECT_CHECK(VirtioPCIBusState, (obj), TYPE_VIRTIO_PCI_BUS) -#define VIRTIO_PCI_BUS_GET_CLASS (obj) \ - OBJECT_GET_CLASS(VirtioPCIBusClass, obj, TYPE_VIRTIO_PCI_BUS) -#define VIRTIO_PCI_BUS_CLASS (klass) \ - OBJECT_CLASS_CHECK(VirtioPCIBusClass, klass, TYPE_VIRTIO_PCI_BUS) +DECLARE_OBJ_CHECKERS (VirtioPCIBusState, VirtioPCIBusClass, + VIRTIO_PCI_BUS, TYPE_VIRTIO_PCI_BUS)enum {VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT ,
@@ -96,12 +92,8 @@ typedef struct {*/ #define TYPE_VIRTIO_PCI "virtio-pci"typedef struct VirtioPCIClass VirtioPCIClass ; -#define VIRTIO_PCI_GET_CLASS (obj) \ - OBJECT_GET_CLASS(VirtioPCIClass, obj, TYPE_VIRTIO_PCI) -#define VIRTIO_PCI_CLASS (klass) \ - OBJECT_CLASS_CHECK(VirtioPCIClass, klass, TYPE_VIRTIO_PCI) -#define VIRTIO_PCI (obj) \ - OBJECT_CHECK(VirtIOPCIProxy, (obj), TYPE_VIRTIO_PCI) +DECLARE_OBJ_CHECKERS (VirtIOPCIProxy, VirtioPCIClass, + VIRTIO_PCI, TYPE_VIRTIO_PCI)struct VirtioPCIClass {PCIDeviceClass parent_class;
hw/virtio/virtio-pmem-pci.h +2 -2
@@ -24,8 +24,8 @@ typedef struct VirtIOPMEMPCI VirtIOPMEMPCI;* virtio-pmem-pci: This extends VirtioPCIProxy. */ #define TYPE_VIRTIO_PMEM_PCI "virtio-pmem-pci-base" -#define VIRTIO_PMEM_PCI (obj) \ - OBJECT_CHECK(VirtIOPMEMPCI, (obj), TYPE_VIRTIO_PMEM_PCI) +DECLARE_INSTANCE_CHECKER (VirtIOPMEMPCI,VIRTIO_PMEM_PCI , + TYPE_VIRTIO_PMEM_PCI)struct VirtIOPMEMPCI {VirtIOPCIProxy parent_obj;
hw/xen/xen_pt.h +2 -2
@@ -40,8 +40,8 @@ typedef struct XenPTReg XenPTReg;typedef struct XenPCIPassthroughState XenPCIPassthroughState ;#define TYPE_XEN_PT_DEVICE "xen-pci-passthrough" -#define XEN_PT_DEVICE (obj) \ - OBJECT_CHECK(XenPCIPassthroughState, (obj), TYPE_XEN_PT_DEVICE) +DECLARE_INSTANCE_CHECKER (XenPCIPassthroughState,XEN_PT_DEVICE , + TYPE_XEN_PT_DEVICE)uint32_t igd_read_opregion (XenPCIPassthroughState *s);void igd_write_opregion (XenPCIPassthroughState *s,uint32_t val);
include/authz/base.h +2 -9
@@ -29,15 +29,8 @@typedef struct QAuthZ QAuthZ ;typedef struct QAuthZClass QAuthZClass ; -#define QAUTHZ_CLASS (klass) \ - OBJECT_CLASS_CHECK(QAuthZClass, (klass), \ - TYPE_QAUTHZ) -#define QAUTHZ_GET_CLASS (obj) \ - OBJECT_GET_CLASS(QAuthZClass, (obj), \ - TYPE_QAUTHZ) -#define QAUTHZ (obj) \ - OBJECT_CHECK(QAuthZ, (obj), \ - TYPE_QAUTHZ) +DECLARE_OBJ_CHECKERS (QAuthZ, QAuthZClass, +QAUTHZ ,TYPE_QAUTHZ )/**
include/authz/list.h +2 -9
@@ -29,15 +29,8 @@typedef struct QAuthZList QAuthZList ;typedef struct QAuthZListClass QAuthZListClass ; -#define QAUTHZ_LIST_CLASS (klass) \ - OBJECT_CLASS_CHECK(QAuthZListClass, (klass), \ - TYPE_QAUTHZ_LIST) -#define QAUTHZ_LIST_GET_CLASS (obj) \ - OBJECT_GET_CLASS(QAuthZListClass, (obj), \ - TYPE_QAUTHZ_LIST) -#define QAUTHZ_LIST (obj) \ - OBJECT_CHECK(QAuthZList, (obj), \ - TYPE_QAUTHZ_LIST) +DECLARE_OBJ_CHECKERS (QAuthZList, QAuthZListClass, +QAUTHZ_LIST ,TYPE_QAUTHZ_LIST )
include/authz/listfile.h +2 -9
@@ -29,15 +29,8 @@typedef struct QAuthZListFile QAuthZListFile ;typedef struct QAuthZListFileClass QAuthZListFileClass ; -#define QAUTHZ_LIST_FILE_CLASS (klass) \ - OBJECT_CLASS_CHECK(QAuthZListFileClass, (klass), \ - TYPE_QAUTHZ_LIST_FILE) -#define QAUTHZ_LIST_FILE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(QAuthZListFileClass, (obj), \ - TYPE_QAUTHZ_LIST_FILE) -#define QAUTHZ_LIST_FILE (obj) \ - OBJECT_CHECK(QAuthZListFile, (obj), \ - TYPE_QAUTHZ_LIST_FILE) +DECLARE_OBJ_CHECKERS (QAuthZListFile, QAuthZListFileClass, +QAUTHZ_LIST_FILE ,TYPE_QAUTHZ_LIST_FILE )
include/authz/pamacct.h +2 -9
@@ -29,15 +29,8 @@typedef struct QAuthZPAM QAuthZPAM ;typedef struct QAuthZPAMClass QAuthZPAMClass ; -#define QAUTHZ_PAM_CLASS (klass) \ - OBJECT_CLASS_CHECK(QAuthZPAMClass, (klass), \ - TYPE_QAUTHZ_PAM) -#define QAUTHZ_PAM_GET_CLASS (obj) \ - OBJECT_GET_CLASS(QAuthZPAMClass, (obj), \ - TYPE_QAUTHZ_PAM) -#define QAUTHZ_PAM (obj) \ - OBJECT_CHECK(QAuthZPAM, (obj), \ - TYPE_QAUTHZ_PAM) +DECLARE_OBJ_CHECKERS (QAuthZPAM, QAuthZPAMClass, +QAUTHZ_PAM ,TYPE_QAUTHZ_PAM )
include/authz/simple.h +2 -9
@@ -28,15 +28,8 @@typedef struct QAuthZSimple QAuthZSimple ;typedef struct QAuthZSimpleClass QAuthZSimpleClass ; -#define QAUTHZ_SIMPLE_CLASS (klass) \ - OBJECT_CLASS_CHECK(QAuthZSimpleClass, (klass), \ - TYPE_QAUTHZ_SIMPLE) -#define QAUTHZ_SIMPLE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(QAuthZSimpleClass, (obj), \ - TYPE_QAUTHZ_SIMPLE) -#define QAUTHZ_SIMPLE (obj) \ - OBJECT_CHECK(QAuthZSimple, (obj), \ - TYPE_QAUTHZ_SIMPLE) +DECLARE_OBJ_CHECKERS (QAuthZSimple, QAuthZSimpleClass, +QAUTHZ_SIMPLE ,TYPE_QAUTHZ_SIMPLE )
include/block/throttle-groups.h +2 -1
@@ -61,7 +61,8 @@ typedef struct ThrottleGroupMember {#define TYPE_THROTTLE_GROUP "throttle-group"typedef struct ThrottleGroup ThrottleGroup ; -#define THROTTLE_GROUP (obj) OBJECT_CHECK(ThrottleGroup, (obj), TYPE_THROTTLE_GROUP) +DECLARE_INSTANCE_CHECKER (ThrottleGroup,THROTTLE_GROUP , + TYPE_THROTTLE_GROUP)const char *throttle_group_get_name (ThrottleGroupMember *tgm);
include/chardev/char-fd.h +2 -1
@@ -38,7 +38,8 @@ typedef struct FDChardev FDChardev;#define TYPE_CHARDEV_FD "chardev-fd" -#define FD_CHARDEV (obj) OBJECT_CHECK(FDChardev, (obj), TYPE_CHARDEV_FD) +DECLARE_INSTANCE_CHECKER (FDChardev,FD_CHARDEV , + TYPE_CHARDEV_FD)void qemu_chr_open_fd (Chardev *chr,int fd_in,int fd_out);int qmp_chardev_open_file_source (char *src,int flags,Error **errp);
include/chardev/char-win.h +2 -1
@@ -44,7 +44,8 @@ typedef struct WinChardev WinChardev;#define NRECVBUF 2048#define TYPE_CHARDEV_WIN "chardev-win" -#define WIN_CHARDEV (obj) OBJECT_CHECK(WinChardev, (obj), TYPE_CHARDEV_WIN) +DECLARE_INSTANCE_CHECKER (WinChardev,WIN_CHARDEV , + TYPE_CHARDEV_WIN)void win_chr_set_file (Chardev *chr,HANDLE file,bool keep_open);int win_chr_serial_init (Chardev *chr,const char *filename,Error **errp);
include/chardev/char.h +2 -5
@@ -227,11 +227,8 @@ int qemu_chr_wait_connected(Chardev *chr, Error **errp);#define TYPE_CHARDEV "chardev"typedef struct ChardevClass ChardevClass ; -#define CHARDEV (obj) OBJECT_CHECK(Chardev, (obj), TYPE_CHARDEV) -#define CHARDEV_CLASS (klass) \ - OBJECT_CLASS_CHECK(ChardevClass, (klass), TYPE_CHARDEV) -#define CHARDEV_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ChardevClass, (obj), TYPE_CHARDEV) +DECLARE_OBJ_CHECKERS (Chardev, ChardevClass, + CHARDEV, TYPE_CHARDEV)#define TYPE_CHARDEV_NULL "chardev-null"#define TYPE_CHARDEV_MUX "chardev-mux"
include/chardev/spice.h +2 -1
@@ -21,7 +21,8 @@ typedef struct SpiceChardev SpiceChardev;#define TYPE_CHARDEV_SPICEVMC "chardev-spicevmc"#define TYPE_CHARDEV_SPICEPORT "chardev-spiceport" -#define SPICE_CHARDEV (obj) OBJECT_CHECK(SpiceChardev, (obj), TYPE_CHARDEV_SPICE) +DECLARE_INSTANCE_CHECKER (SpiceChardev,SPICE_CHARDEV , + TYPE_CHARDEV_SPICE)void qemu_chr_open_spice_port (Chardev *chr,ChardevBackend *backend,bool *be_opened,Error **errp);
include/crypto/secret.h +2 -2
@@ -27,8 +27,8 @@#define TYPE_QCRYPTO_SECRET "secret"typedef struct QCryptoSecret QCryptoSecret ; -#define QCRYPTO_SECRET (obj) \ - OBJECT_CHECK(QCryptoSecret, (obj), TYPE_QCRYPTO_SECRET) +DECLARE_INSTANCE_CHECKER (QCryptoSecret,QCRYPTO_SECRET , + TYPE_QCRYPTO_SECRET)typedef struct QCryptoSecretClass QCryptoSecretClass ;
include/crypto/secret_common.h +2 -8
@@ -27,14 +27,8 @@#define TYPE_QCRYPTO_SECRET_COMMON "secret_common"typedef struct QCryptoSecretCommon QCryptoSecretCommon ;typedef struct QCryptoSecretCommonClass QCryptoSecretCommonClass ; -#define QCRYPTO_SECRET_COMMON (obj) \ - OBJECT_CHECK(QCryptoSecretCommon, (obj), TYPE_QCRYPTO_SECRET_COMMON) -#define QCRYPTO_SECRET_COMMON_CLASS (class) \ - OBJECT_CLASS_CHECK(QCryptoSecretCommonClass, \ - (class), TYPE_QCRYPTO_SECRET_COMMON) -#define QCRYPTO_SECRET_COMMON_GET_CLASS (obj) \ - OBJECT_GET_CLASS(QCryptoSecretCommonClass, \ - (obj), TYPE_QCRYPTO_SECRET_COMMON) +DECLARE_OBJ_CHECKERS (QCryptoSecretCommon, QCryptoSecretCommonClass, + QCRYPTO_SECRET_COMMON, TYPE_QCRYPTO_SECRET_COMMON)struct QCryptoSecretCommon {
include/crypto/secret_keyring.h +2 -9
@@ -28,15 +28,8 @@#define TYPE_QCRYPTO_SECRET_KEYRING "secret_keyring"typedef struct QCryptoSecretKeyring QCryptoSecretKeyring ;typedef struct QCryptoSecretKeyringClass QCryptoSecretKeyringClass ; -#define QCRYPTO_SECRET_KEYRING (obj) \ - OBJECT_CHECK(QCryptoSecretKeyring, (obj), \ - TYPE_QCRYPTO_SECRET_KEYRING) -#define QCRYPTO_SECRET_KEYRING_CLASS (class) \ - OBJECT_CLASS_CHECK(QCryptoSecretKeyringClass, \ - (class), TYPE_QCRYPTO_SECRET_KEYRING) -#define QCRYPTO_SECRET_KEYRING_GET_CLASS (class) \ - OBJECT_GET_CLASS(QCryptoSecretKeyringClass, \ - (class), TYPE_QCRYPTO_SECRET_KEYRING) +DECLARE_OBJ_CHECKERS (QCryptoSecretKeyring, QCryptoSecretKeyringClass, + QCRYPTO_SECRET_KEYRING, TYPE_QCRYPTO_SECRET_KEYRING)struct QCryptoSecretKeyring {
include/crypto/tls-cipher-suites.h +2 -2
@@ -16,8 +16,8 @@#define TYPE_QCRYPTO_TLS_CIPHER_SUITES "tls-cipher-suites"typedef struct QCryptoTLSCipherSuites QCryptoTLSCipherSuites ; -#define QCRYPTO_TLS_CIPHER_SUITES (obj) \ - OBJECT_CHECK(QCryptoTLSCipherSuites, (obj), TYPE_QCRYPTO_TLS_CIPHER_SUITES) +DECLARE_INSTANCE_CHECKER (QCryptoTLSCipherSuites,QCRYPTO_TLS_CIPHER_SUITES , + TYPE_QCRYPTO_TLS_CIPHER_SUITES)struct QCryptoTLSCipherSuites {/* <private> */
include/crypto/tlscreds.h +2 -2
@@ -30,8 +30,8 @@#define TYPE_QCRYPTO_TLS_CREDS "tls-creds"typedef struct QCryptoTLSCreds QCryptoTLSCreds ; -#define QCRYPTO_TLS_CREDS (obj) \ - OBJECT_CHECK(QCryptoTLSCreds, (obj), TYPE_QCRYPTO_TLS_CREDS) +DECLARE_INSTANCE_CHECKER (QCryptoTLSCreds,QCRYPTO_TLS_CREDS , + TYPE_QCRYPTO_TLS_CREDS)typedef struct QCryptoTLSCredsClass QCryptoTLSCredsClass ;
include/crypto/tlscredsanon.h +2 -2
@@ -26,8 +26,8 @@#define TYPE_QCRYPTO_TLS_CREDS_ANON "tls-creds-anon"typedef struct QCryptoTLSCredsAnon QCryptoTLSCredsAnon ; -#define QCRYPTO_TLS_CREDS_ANON (obj) \ - OBJECT_CHECK(QCryptoTLSCredsAnon, (obj), TYPE_QCRYPTO_TLS_CREDS_ANON) +DECLARE_INSTANCE_CHECKER (QCryptoTLSCredsAnon,QCRYPTO_TLS_CREDS_ANON , + TYPE_QCRYPTO_TLS_CREDS_ANON)typedef struct QCryptoTLSCredsAnonClass QCryptoTLSCredsAnonClass ;
include/crypto/tlscredspsk.h +2 -2
@@ -26,8 +26,8 @@#define TYPE_QCRYPTO_TLS_CREDS_PSK "tls-creds-psk"typedef struct QCryptoTLSCredsPSK QCryptoTLSCredsPSK ; -#define QCRYPTO_TLS_CREDS_PSK (obj) \ - OBJECT_CHECK(QCryptoTLSCredsPSK, (obj), TYPE_QCRYPTO_TLS_CREDS_PSK) +DECLARE_INSTANCE_CHECKER (QCryptoTLSCredsPSK,QCRYPTO_TLS_CREDS_PSK , + TYPE_QCRYPTO_TLS_CREDS_PSK)typedef struct QCryptoTLSCredsPSKClass QCryptoTLSCredsPSKClass ;
include/crypto/tlscredsx509.h +2 -2
@@ -26,8 +26,8 @@#define TYPE_QCRYPTO_TLS_CREDS_X509 "tls-creds-x509"typedef struct QCryptoTLSCredsX509 QCryptoTLSCredsX509 ; -#define QCRYPTO_TLS_CREDS_X509 (obj) \ - OBJECT_CHECK(QCryptoTLSCredsX509, (obj), TYPE_QCRYPTO_TLS_CREDS_X509) +DECLARE_INSTANCE_CHECKER (QCryptoTLSCredsX509,QCRYPTO_TLS_CREDS_X509 , + TYPE_QCRYPTO_TLS_CREDS_X509)typedef struct QCryptoTLSCredsX509Class QCryptoTLSCredsX509Class ;
include/exec/memory.h +4 -10
@@ -34,19 +34,13 @@#define MAX_PHYS_ADDR (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)#define TYPE_MEMORY_REGION "qemu:memory-region" -#define MEMORY_REGION (obj) \ - OBJECT_CHECK(MemoryRegion, (obj), TYPE_MEMORY_REGION) +DECLARE_INSTANCE_CHECKER (MemoryRegion,MEMORY_REGION , + TYPE_MEMORY_REGION)#define TYPE_IOMMU_MEMORY_REGION "qemu:iommu-memory-region"typedef struct IOMMUMemoryRegionClass IOMMUMemoryRegionClass ; -#define IOMMU_MEMORY_REGION (obj) \ - OBJECT_CHECK(IOMMUMemoryRegion, (obj), TYPE_IOMMU_MEMORY_REGION) -#define IOMMU_MEMORY_REGION_CLASS (klass) \ - OBJECT_CLASS_CHECK(IOMMUMemoryRegionClass, (klass), \ - TYPE_IOMMU_MEMORY_REGION) -#define IOMMU_MEMORY_REGION_GET_CLASS (obj) \ - OBJECT_GET_CLASS(IOMMUMemoryRegionClass, (obj), \ - TYPE_IOMMU_MEMORY_REGION) +DECLARE_OBJ_CHECKERS (IOMMUMemoryRegion, IOMMUMemoryRegionClass, + IOMMU_MEMORY_REGION, TYPE_IOMMU_MEMORY_REGION)extern bool global_dirty_log;
include/hw/acpi/acpi_dev_interface.h +2 -6
@@ -19,12 +19,8 @@ typedef enum {#define TYPE_ACPI_DEVICE_IF "acpi-device-interface"typedef struct AcpiDeviceIfClass AcpiDeviceIfClass ; -#define ACPI_DEVICE_IF_CLASS (klass) \ - OBJECT_CLASS_CHECK(AcpiDeviceIfClass, (klass), \ - TYPE_ACPI_DEVICE_IF) -#define ACPI_DEVICE_IF_GET_CLASS (obj) \ - OBJECT_GET_CLASS(AcpiDeviceIfClass, (obj), \ - TYPE_ACPI_DEVICE_IF) +DECLARE_CLASS_CHECKERS (AcpiDeviceIfClass,ACPI_DEVICE_IF , + TYPE_ACPI_DEVICE_IF)#define ACPI_DEVICE_IF (obj) \ INTERFACE_CHECK(AcpiDeviceIf, (obj), \ TYPE_ACPI_DEVICE_IF)
include/hw/acpi/generic_event_device.h +2 -2
@@ -68,8 +68,8 @@#define TYPE_ACPI_GED "acpi-ged"typedef struct AcpiGedState AcpiGedState ; -#define ACPI_GED (obj) \ - OBJECT_CHECK(AcpiGedState, (obj), TYPE_ACPI_GED) +DECLARE_INSTANCE_CHECKER (AcpiGedState,ACPI_GED , + TYPE_ACPI_GED)#define ACPI_GED_EVT_SEL_OFFSET 0x0#define ACPI_GED_EVT_SEL_LEN 0x4
include/hw/acpi/vmgenid.h +2 -1
@@ -17,7 +17,8 @@*/ typedef struct VmGenIdState VmGenIdState ; -#define VMGENID (obj) OBJECT_CHECK(VmGenIdState, (obj), VMGENID_DEVICE) +DECLARE_INSTANCE_CHECKER (VmGenIdState,VMGENID , + VMGENID_DEVICE)struct VmGenIdState {DeviceClass parent_obj;
include/hw/adc/stm32f2xx_adc.h +2 -2
@@ -60,8 +60,8 @@#define TYPE_STM32F2XX_ADC "stm32f2xx-adc"typedef struct STM32F2XXADCState STM32F2XXADCState ; -#define STM32F2XX_ADC (obj) \ - OBJECT_CHECK(STM32F2XXADCState, (obj), TYPE_STM32F2XX_ADC) +DECLARE_INSTANCE_CHECKER (STM32F2XXADCState,STM32F2XX_ADC , + TYPE_STM32F2XX_ADC)struct STM32F2XXADCState {/* <private> */
include/hw/arm/allwinner-a10.h +2 -1
@@ -23,7 +23,8 @@#define TYPE_AW_A10 "allwinner-a10"typedef struct AwA10State AwA10State ; -#define AW_A10 (obj) OBJECT_CHECK(AwA10State, (obj), TYPE_AW_A10) +DECLARE_INSTANCE_CHECKER (AwA10State,AW_A10 , + TYPE_AW_A10)struct AwA10State {/*< private >*/
include/hw/arm/allwinner-h3.h +2 -1
@@ -107,7 +107,8 @@ enum {/** Convert input object to Allwinner H3 state object */ typedef struct AwH3State AwH3State ; -#define AW_H3 (obj) OBJECT_CHECK(AwH3State, (obj), TYPE_AW_H3) +DECLARE_INSTANCE_CHECKER (AwH3State,AW_H3 , +TYPE_AW_H3 )/** @} */
include/hw/arm/armv7m.h +4 -2
@@ -17,7 +17,8 @@#define TYPE_BITBAND "ARM,bitband-memory"typedef struct BitBandState BitBandState ; -#define BITBAND (obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND) +DECLARE_INSTANCE_CHECKER (BitBandState,BITBAND , + TYPE_BITBAND)struct BitBandState {/*< private >*/
@@ -32,7 +33,8 @@ struct BitBandState {#define TYPE_ARMV7M "armv7m"typedef struct ARMv7MState ARMv7MState ; -#define ARMV7M (obj) OBJECT_CHECK(ARMv7MState, (obj), TYPE_ARMV7M) +DECLARE_INSTANCE_CHECKER (ARMv7MState,ARMV7M , + TYPE_ARMV7M)#define ARMV7M_NUM_BITBANDS 2
include/hw/arm/aspeed.h +2 -6
@@ -16,18 +16,14 @@ typedef struct AspeedMachineState AspeedMachineState;#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")typedef struct AspeedMachineClass AspeedMachineClass ; -#define ASPEED_MACHINE (obj) \ - OBJECT_CHECK(AspeedMachineState, (obj), TYPE_ASPEED_MACHINE) +DECLARE_OBJ_CHECKERS (AspeedMachineState, AspeedMachineClass, + ASPEED_MACHINE, TYPE_ASPEED_MACHINE)#define ASPEED_MAC0_ON (1 << 0)#define ASPEED_MAC1_ON (1 << 1)#define ASPEED_MAC2_ON (1 << 2)#define ASPEED_MAC3_ON (1 << 3) -#define ASPEED_MACHINE_CLASS (klass) \ - OBJECT_CLASS_CHECK(AspeedMachineClass, (klass), TYPE_ASPEED_MACHINE) -#define ASPEED_MACHINE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(AspeedMachineClass, (obj), TYPE_ASPEED_MACHINE)struct AspeedMachineClass {MachineClass parent_obj;
include/hw/arm/aspeed_soc.h +2 -5
@@ -66,7 +66,8 @@ typedef struct AspeedSoCState AspeedSoCState;#define TYPE_ASPEED_SOC "aspeed-soc"typedef struct AspeedSoCClass AspeedSoCClass ; -#define ASPEED_SOC (obj) OBJECT_CHECK(AspeedSoCState, (obj), TYPE_ASPEED_SOC) +DECLARE_OBJ_CHECKERS (AspeedSoCState, AspeedSoCClass, + ASPEED_SOC, TYPE_ASPEED_SOC)struct AspeedSoCClass {DeviceClass parent_class;
@@ -84,10 +85,6 @@ struct AspeedSoCClass {uint32_t num_cpus; }; -#define ASPEED_SOC_CLASS (klass) \ - OBJECT_CLASS_CHECK(AspeedSoCClass, (klass), TYPE_ASPEED_SOC) -#define ASPEED_SOC_GET_CLASS (obj) \ - OBJECT_GET_CLASS(AspeedSoCClass, (obj), TYPE_ASPEED_SOC)enum {ASPEED_DEV_IOMEM ,
include/hw/arm/bcm2835_peripherals.h +2 -2
@@ -33,8 +33,8 @@#define TYPE_BCM2835_PERIPHERALS "bcm2835-peripherals"typedef struct BCM2835PeripheralState BCM2835PeripheralState ; -#define BCM2835_PERIPHERALS (obj) \ - OBJECT_CHECK(BCM2835PeripheralState, (obj), TYPE_BCM2835_PERIPHERALS) +DECLARE_INSTANCE_CHECKER (BCM2835PeripheralState,BCM2835_PERIPHERALS , + TYPE_BCM2835_PERIPHERALS)struct BCM2835PeripheralState {/*< private >*/
include/hw/arm/bcm2836.h +2 -5
@@ -20,7 +20,8 @@#define TYPE_BCM283X "bcm283x"typedef struct BCM283XClass BCM283XClass ;typedef struct BCM283XState BCM283XState ; -#define BCM283X (obj) OBJECT_CHECK(BCM283XState, (obj), TYPE_BCM283X) +DECLARE_OBJ_CHECKERS (BCM283XState, BCM283XClass, + BCM283X, TYPE_BCM283X)#define BCM283X_NCPUS 4
@@ -52,9 +53,5 @@ struct BCM283XClass { const BCM283XInfo *info; }; -#define BCM283X_CLASS (klass) \ - OBJECT_CLASS_CHECK(BCM283XClass, (klass), TYPE_BCM283X) -#define BCM283X_GET_CLASS (obj) \ - OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X)#endif /* BCM2836_H */
include/hw/arm/digic.h +2 -1
@@ -26,7 +26,8 @@#define TYPE_DIGIC "digic"typedef struct DigicState DigicState ; -#define DIGIC (obj) OBJECT_CHECK(DigicState, (obj), TYPE_DIGIC) +DECLARE_INSTANCE_CHECKER (DigicState,DIGIC , + TYPE_DIGIC)#define DIGIC4_NB_TIMERS 3
include/hw/arm/exynos4210.h +2 -2
@@ -106,8 +106,8 @@ struct Exynos4210State {typedef struct Exynos4210State Exynos4210State ;#define TYPE_EXYNOS4210_SOC "exynos4210" -#define EXYNOS4210_SOC (obj) \ - OBJECT_CHECK(Exynos4210State, obj, TYPE_EXYNOS4210_SOC) +DECLARE_INSTANCE_CHECKER (Exynos4210State,EXYNOS4210_SOC , + TYPE_EXYNOS4210_SOC)void exynos4210_write_secondary (ARMCPU *cpu,const struct arm_boot_info *info);
include/hw/arm/fsl-imx25.h +2 -1
@@ -36,7 +36,8 @@#define TYPE_FSL_IMX25 "fsl,imx25"typedef struct FslIMX25State FslIMX25State ; -#define FSL_IMX25 (obj) OBJECT_CHECK(FslIMX25State, (obj), TYPE_FSL_IMX25) +DECLARE_INSTANCE_CHECKER (FslIMX25State,FSL_IMX25 , + TYPE_FSL_IMX25)#define FSL_IMX25_NUM_UARTS 5#define FSL_IMX25_NUM_GPTS 4
include/hw/arm/fsl-imx31.h +2 -1
@@ -32,7 +32,8 @@#define TYPE_FSL_IMX31 "fsl,imx31"typedef struct FslIMX31State FslIMX31State ; -#define FSL_IMX31 (obj) OBJECT_CHECK(FslIMX31State, (obj), TYPE_FSL_IMX31) +DECLARE_INSTANCE_CHECKER (FslIMX31State,FSL_IMX31 , + TYPE_FSL_IMX31)#define FSL_IMX31_NUM_UARTS 2#define FSL_IMX31_NUM_EPITS 2
include/hw/arm/fsl-imx6.h +2 -1
@@ -38,7 +38,8 @@#define TYPE_FSL_IMX6 "fsl,imx6"typedef struct FslIMX6State FslIMX6State ; -#define FSL_IMX6 (obj) OBJECT_CHECK(FslIMX6State, (obj), TYPE_FSL_IMX6) +DECLARE_INSTANCE_CHECKER (FslIMX6State,FSL_IMX6 , + TYPE_FSL_IMX6)#define FSL_IMX6_NUM_CPUS 4#define FSL_IMX6_NUM_UARTS 5
include/hw/arm/fsl-imx6ul.h +2 -1
@@ -42,7 +42,8 @@#define TYPE_FSL_IMX6UL "fsl,imx6ul"typedef struct FslIMX6ULState FslIMX6ULState ; -#define FSL_IMX6UL (obj) OBJECT_CHECK(FslIMX6ULState, (obj), TYPE_FSL_IMX6UL) +DECLARE_INSTANCE_CHECKER (FslIMX6ULState,FSL_IMX6UL , + TYPE_FSL_IMX6UL)enum FslIMX6ULConfiguration {FSL_IMX6UL_NUM_CPUS =1 ,
include/hw/arm/fsl-imx7.h +2 -1
@@ -43,7 +43,8 @@#define TYPE_FSL_IMX7 "fsl,imx7"typedef struct FslIMX7State FslIMX7State ; -#define FSL_IMX7 (obj) OBJECT_CHECK(FslIMX7State, (obj), TYPE_FSL_IMX7) +DECLARE_INSTANCE_CHECKER (FslIMX7State,FSL_IMX7 , + TYPE_FSL_IMX7)enum FslIMX7Configuration {FSL_IMX7_NUM_CPUS =2 ,
include/hw/arm/linux-boot-if.h +2 -4
@@ -10,10 +10,8 @@#define TYPE_ARM_LINUX_BOOT_IF "arm-linux-boot-if"typedef struct ARMLinuxBootIfClass ARMLinuxBootIfClass ; -#define ARM_LINUX_BOOT_IF_CLASS (klass) \ - OBJECT_CLASS_CHECK(ARMLinuxBootIfClass, (klass), TYPE_ARM_LINUX_BOOT_IF) -#define ARM_LINUX_BOOT_IF_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ARMLinuxBootIfClass, (obj), TYPE_ARM_LINUX_BOOT_IF) +DECLARE_CLASS_CHECKERS (ARMLinuxBootIfClass,ARM_LINUX_BOOT_IF , + TYPE_ARM_LINUX_BOOT_IF)#define ARM_LINUX_BOOT_IF (obj) \ INTERFACE_CHECK(ARMLinuxBootIf, (obj), TYPE_ARM_LINUX_BOOT_IF)
include/hw/arm/msf2-soc.h +2 -1
@@ -34,7 +34,8 @@#define TYPE_MSF2_SOC "msf2-soc"typedef struct MSF2State MSF2State ; -#define MSF2_SOC (obj) OBJECT_CHECK(MSF2State, (obj), TYPE_MSF2_SOC) +DECLARE_INSTANCE_CHECKER (MSF2State,MSF2_SOC , + TYPE_MSF2_SOC)#define MSF2_NUM_SPIS 2#define MSF2_NUM_UARTS 2
include/hw/arm/nrf51_soc.h +2 -2
@@ -21,8 +21,8 @@#define TYPE_NRF51_SOC "nrf51-soc"typedef struct NRF51State NRF51State ; -#define NRF51_SOC (obj) \ - OBJECT_CHECK(NRF51State, (obj), TYPE_NRF51_SOC) +DECLARE_INSTANCE_CHECKER (NRF51State,NRF51_SOC , + TYPE_NRF51_SOC)#define NRF51_NUM_TIMERS 3
include/hw/arm/omap.h +8 -7
@@ -71,8 +71,8 @@ void omap_clk_reparent(omap_clk clk, omap_clk parent);/* omap_intc.c */ #define TYPE_OMAP_INTC "common-omap-intc"typedef struct omap_intr_handler_s omap_intr_handler ; -#define OMAP_INTC (obj) \ - OBJECT_CHECK(omap_intr_handler, (obj), TYPE_OMAP_INTC) +DECLARE_INSTANCE_CHECKER (omap_intr_handler,OMAP_INTC , +TYPE_OMAP_INTC )/*
@@ -95,7 +95,8 @@ void omap_intc_set_fclk(omap_intr_handler *intc, omap_clk clk);/* omap_i2c.c */ #define TYPE_OMAP_I2C "omap_i2c"typedef struct OMAPI2CState OMAPI2CState ; -#define OMAP_I2C (obj) OBJECT_CHECK(OMAPI2CState, (obj), TYPE_OMAP_I2C) +DECLARE_INSTANCE_CHECKER (OMAPI2CState,OMAP_I2C , +TYPE_OMAP_I2C )/* TODO: clock framework (see above) */
@@ -104,12 +105,12 @@ void omap_i2c_set_fclk(OMAPI2CState *i2c, omap_clk clk);/* omap_gpio.c */ #define TYPE_OMAP1_GPIO "omap-gpio" -#define OMAP1_GPIO (obj) \ - OBJECT_CHECK(struct omap_gpif_s, (obj), TYPE_OMAP1_GPIO) +DECLARE_INSTANCE_CHECKER(struct omap_gpif_s, OMAP1_GPIO, + TYPE_OMAP1_GPIO)#define TYPE_OMAP2_GPIO "omap2-gpio" -#define OMAP2_GPIO (obj) \ - OBJECT_CHECK(struct omap2_gpif_s, (obj), TYPE_OMAP2_GPIO) +DECLARE_INSTANCE_CHECKER(struct omap2_gpif_s, OMAP2_GPIO, + TYPE_OMAP2_GPIO)typedef struct omap_gpif_s omap_gpif ;typedef struct omap2_gpif_s omap2_gpif ;
include/hw/arm/pxa.h +8 -6
@@ -89,7 +89,8 @@ void pxa2xx_lcd_vsync_notifier(PXA2xxLCDState *s, qemu_irq handler);/* pxa2xx_mmci.c */ #define TYPE_PXA2XX_MMCI "pxa2xx-mmci"typedef struct PXA2xxMMCIState PXA2xxMMCIState ; -#define PXA2XX_MMCI (obj) OBJECT_CHECK(PXA2xxMMCIState, (obj), TYPE_PXA2XX_MMCI) +DECLARE_INSTANCE_CHECKER (PXA2xxMMCIState,PXA2XX_MMCI , + TYPE_PXA2XX_MMCI) PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem, hwaddr base,
@@ -100,8 +101,8 @@ void pxa2xx_mmci_handlers(PXA2xxMMCIState *s, qemu_irq readonly,/* pxa2xx_pcmcia.c */ #define TYPE_PXA2XX_PCMCIA "pxa2xx-pcmcia"typedef struct PXA2xxPCMCIAState PXA2xxPCMCIAState ; -#define PXA2XX_PCMCIA (obj) \ - OBJECT_CHECK(PXA2xxPCMCIAState, obj, TYPE_PXA2XX_PCMCIA) +DECLARE_INSTANCE_CHECKER (PXA2xxPCMCIAState,PXA2XX_PCMCIA , + TYPE_PXA2XX_PCMCIA)PXA2xxPCMCIAState *pxa2xx_pcmcia_init (MemoryRegion *sysmem,hwaddr base);
@@ -129,12 +130,13 @@ I2CBus *pxa2xx_i2c_bus(PXA2xxI2CState *s);#define TYPE_PXA2XX_I2C "pxa2xx_i2c"typedef struct PXA2xxI2SState PXA2xxI2SState ; -#define PXA2XX_I2C (obj) \ - OBJECT_CHECK(PXA2xxI2CState, (obj), TYPE_PXA2XX_I2C) +DECLARE_INSTANCE_CHECKER (PXA2xxI2CState,PXA2XX_I2C , + TYPE_PXA2XX_I2C)#define TYPE_PXA2XX_FIR "pxa2xx-fir"typedef struct PXA2xxFIrState PXA2xxFIrState ; -#define PXA2XX_FIR (obj) OBJECT_CHECK(PXA2xxFIrState, (obj), TYPE_PXA2XX_FIR) +DECLARE_INSTANCE_CHECKER (PXA2xxFIrState,PXA2XX_FIR , + TYPE_PXA2XX_FIR) typedef struct { ARMCPU *cpu;
include/hw/arm/smmu-common.h +2 -5
@@ -132,11 +132,8 @@ struct SMMUBaseClass {typedef struct SMMUBaseClass SMMUBaseClass ;#define TYPE_ARM_SMMU "arm-smmu" -#define ARM_SMMU (obj) OBJECT_CHECK(SMMUState, (obj), TYPE_ARM_SMMU) -#define ARM_SMMU_CLASS (klass) \ - OBJECT_CLASS_CHECK(SMMUBaseClass, (klass), TYPE_ARM_SMMU) -#define ARM_SMMU_GET_CLASS (obj) \ - OBJECT_GET_CLASS(SMMUBaseClass, (obj), TYPE_ARM_SMMU) +DECLARE_OBJ_CHECKERS (SMMUState, SMMUBaseClass, +ARM_SMMU ,TYPE_ARM_SMMU ) /* Return the SMMUPciBus handle associated to a PCI bus number */SMMUPciBus *smmu_find_smmu_pcibus (SMMUState *s,uint8_t bus_num);
include/hw/arm/smmuv3.h +2 -5
@@ -83,10 +83,7 @@ struct SMMUv3Class {typedef struct SMMUv3Class SMMUv3Class ;#define TYPE_ARM_SMMUV3 "arm-smmuv3" -#define ARM_SMMUV3 (obj) OBJECT_CHECK(SMMUv3State, (obj), TYPE_ARM_SMMUV3) -#define ARM_SMMUV3_CLASS (klass) \ - OBJECT_CLASS_CHECK(SMMUv3Class, (klass), TYPE_ARM_SMMUV3) -#define ARM_SMMUV3_GET_CLASS (obj) \ - OBJECT_GET_CLASS(SMMUv3Class, (obj), TYPE_ARM_SMMUV3) +DECLARE_OBJ_CHECKERS (SMMUv3State, SMMUv3Class, + ARM_SMMUV3, TYPE_ARM_SMMUV3)#endif
include/hw/arm/stm32f205_soc.h +2 -2
@@ -36,8 +36,8 @@#define TYPE_STM32F205_SOC "stm32f205-soc"typedef struct STM32F205State STM32F205State ; -#define STM32F205_SOC (obj) \ - OBJECT_CHECK(STM32F205State, (obj), TYPE_STM32F205_SOC) +DECLARE_INSTANCE_CHECKER (STM32F205State,STM32F205_SOC , + TYPE_STM32F205_SOC)#define STM_NUM_USARTS 6#define STM_NUM_TIMERS 4
include/hw/arm/stm32f405_soc.h +2 -2
@@ -37,8 +37,8 @@#define TYPE_STM32F405_SOC "stm32f405-soc"typedef struct STM32F405State STM32F405State ; -#define STM32F405_SOC (obj) \ - OBJECT_CHECK(STM32F405State, (obj), TYPE_STM32F405_SOC) +DECLARE_INSTANCE_CHECKER (STM32F405State,STM32F405_SOC , + TYPE_STM32F405_SOC)#define STM_NUM_USARTS 7#define STM_NUM_TIMERS 4
include/hw/arm/virt.h +2 -6
@@ -170,12 +170,8 @@ typedef struct VirtMachineState VirtMachineState;#define VIRT_ECAM_ID (high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt") -#define VIRT_MACHINE (obj) \ - OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE) -#define VIRT_MACHINE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(VirtMachineClass, obj, TYPE_VIRT_MACHINE) -#define VIRT_MACHINE_CLASS (klass) \ - OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE) +DECLARE_OBJ_CHECKERS (VirtMachineState, VirtMachineClass, + VIRT_MACHINE, TYPE_VIRT_MACHINE)void virt_acpi_setup (VirtMachineState *vms);bool virt_is_acpi_enabled (VirtMachineState *vms);
include/hw/arm/xlnx-versal.h +2 -1
@@ -24,7 +24,8 @@#define TYPE_XLNX_VERSAL "xlnx-versal"typedef struct Versal Versal ; -#define XLNX_VERSAL (obj) OBJECT_CHECK(Versal, (obj), TYPE_XLNX_VERSAL) +DECLARE_INSTANCE_CHECKER (Versal,XLNX_VERSAL , + TYPE_XLNX_VERSAL)#define XLNX_VERSAL_NR_ACPUS 2#define XLNX_VERSAL_NR_UARTS 2
include/hw/arm/xlnx-zynqmp.h +2 -2
@@ -36,8 +36,8 @@#define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"typedef struct XlnxZynqMPState XlnxZynqMPState ; -#define XLNX_ZYNQMP (obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ - TYPE_XLNX_ZYNQMP) +DECLARE_INSTANCE_CHECKER (XlnxZynqMPState,XLNX_ZYNQMP , + TYPE_XLNX_ZYNQMP)#define XLNX_ZYNQMP_NUM_APU_CPUS 4#define XLNX_ZYNQMP_NUM_RPU_CPUS 2
include/hw/block/flash.h +4 -4
@@ -10,8 +10,8 @@#define TYPE_PFLASH_CFI01 "cfi.pflash01"typedef struct PFlashCFI01 PFlashCFI01 ; -#define PFLASH_CFI01 (obj) \ - OBJECT_CHECK(PFlashCFI01, (obj), TYPE_PFLASH_CFI01) +DECLARE_INSTANCE_CHECKER (PFlashCFI01,PFLASH_CFI01 , + TYPE_PFLASH_CFI01) PFlashCFI01 *pflash_cfi01_register(hwaddr base,
@@ -31,8 +31,8 @@ void pflash_cfi01_legacy_drive(PFlashCFI01 *dev, DriveInfo *dinfo);#define TYPE_PFLASH_CFI02 "cfi.pflash02"typedef struct PFlashCFI02 PFlashCFI02 ; -#define PFLASH_CFI02 (obj) \ - OBJECT_CHECK(PFlashCFI02, (obj), TYPE_PFLASH_CFI02) +DECLARE_INSTANCE_CHECKER (PFlashCFI02,PFLASH_CFI02 , + TYPE_PFLASH_CFI02) PFlashCFI02 *pflash_cfi02_register(hwaddr base,
include/hw/block/swim.h +4 -2
@@ -22,7 +22,8 @@ typedef struct SWIMBus SWIMBus;typedef struct SWIMCtrl SWIMCtrl ;#define TYPE_SWIM_DRIVE "swim-drive" -#define SWIM_DRIVE (obj) OBJECT_CHECK(SWIMDrive, (obj), TYPE_SWIM_DRIVE) +DECLARE_INSTANCE_CHECKER (SWIMDrive,SWIM_DRIVE , + TYPE_SWIM_DRIVE)struct SWIMDrive {DeviceState qdev;
@@ -31,7 +32,8 @@ struct SWIMDrive { };#define TYPE_SWIM_BUS "swim-bus" -#define SWIM_BUS (obj) OBJECT_CHECK(SWIMBus, (obj), TYPE_SWIM_BUS) +DECLARE_INSTANCE_CHECKER (SWIMBus,SWIM_BUS , + TYPE_SWIM_BUS)struct SWIMBus {BusState bus;
include/hw/boards.h +2 -6
@@ -21,12 +21,8 @@#define TYPE_MACHINE "machine"#undef MACHINE/* BSD defines it and QEMU does not use it */ -#define MACHINE (obj) \ - OBJECT_CHECK(MachineState, (obj), TYPE_MACHINE) -#define MACHINE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(MachineClass, (obj), TYPE_MACHINE) -#define MACHINE_CLASS (klass) \ - OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) +DECLARE_OBJ_CHECKERS (MachineState, MachineClass, + MACHINE, TYPE_MACHINE)extern MachineState *current_machine;
include/hw/char/avr_usart.h +2 -2
@@ -59,8 +59,8 @@#define TYPE_AVR_USART "avr-usart"typedef struct AVRUsartState AVRUsartState ; -#define AVR_USART (obj) \ - OBJECT_CHECK(AVRUsartState, (obj), TYPE_AVR_USART) +DECLARE_INSTANCE_CHECKER (AVRUsartState,AVR_USART , + TYPE_AVR_USART)struct AVRUsartState {/* <private> */
include/hw/char/bcm2835_aux.h +2 -1
@@ -15,7 +15,8 @@#define TYPE_BCM2835_AUX "bcm2835-aux"typedef struct BCM2835AuxState BCM2835AuxState ; -#define BCM2835_AUX (obj) OBJECT_CHECK(BCM2835AuxState, (obj), TYPE_BCM2835_AUX) +DECLARE_INSTANCE_CHECKER (BCM2835AuxState,BCM2835_AUX , + TYPE_BCM2835_AUX)#define BCM2835_AUX_RX_FIFO_LEN 8
include/hw/char/cadence_uart.h +2 -2
@@ -33,8 +33,8 @@#define TYPE_CADENCE_UART "cadence_uart"typedef struct CadenceUARTState CadenceUARTState ; -#define CADENCE_UART (obj) OBJECT_CHECK(CadenceUARTState, (obj), \ - TYPE_CADENCE_UART) +DECLARE_INSTANCE_CHECKER (CadenceUARTState,CADENCE_UART , + TYPE_CADENCE_UART)struct CadenceUARTState {/*< private >*/
include/hw/char/cmsdk-apb-uart.h +2 -2
@@ -19,8 +19,8 @@#define TYPE_CMSDK_APB_UART "cmsdk-apb-uart"typedef struct CMSDKAPBUART CMSDKAPBUART ; -#define CMSDK_APB_UART (obj) OBJECT_CHECK(CMSDKAPBUART, (obj), \ - TYPE_CMSDK_APB_UART) +DECLARE_INSTANCE_CHECKER (CMSDKAPBUART ,CMSDK_APB_UART , + TYPE_CMSDK_APB_UART)struct CMSDKAPBUART {/*< private >*/
include/hw/char/digic-uart.h +2 -2
@@ -24,8 +24,8 @@#define TYPE_DIGIC_UART "digic-uart"typedef struct DigicUartState DigicUartState ; -#define DIGIC_UART (obj) \ - OBJECT_CHECK(DigicUartState, (obj), TYPE_DIGIC_UART) +DECLARE_INSTANCE_CHECKER (DigicUartState,DIGIC_UART , + TYPE_DIGIC_UART)enum {R_TX =0x00 ,
include/hw/char/escc.h +2 -1
@@ -12,7 +12,8 @@#define ESCC_SIZE 4typedef struct ESCCState ESCCState ; -#define ESCC (obj) OBJECT_CHECK(ESCCState, (obj), TYPE_ESCC) +DECLARE_INSTANCE_CHECKER (ESCCState,ESCC , + TYPE_ESCC) typedef enum { escc_chn_a, escc_chn_b,
include/hw/char/ibex_uart.h +2 -2
@@ -71,8 +71,8 @@ REG32(TIMEOUT_CTRL, 0x2c)#define TYPE_IBEX_UART "ibex-uart"typedef struct IbexUartState IbexUartState ; -#define IBEX_UART (obj) \ - OBJECT_CHECK(IbexUartState, (obj), TYPE_IBEX_UART) +DECLARE_INSTANCE_CHECKER (IbexUartState,IBEX_UART , + TYPE_IBEX_UART)struct IbexUartState {/* <private> */
include/hw/char/imx_serial.h +2 -1
@@ -24,7 +24,8 @@#define TYPE_IMX_SERIAL "imx.serial"typedef struct IMXSerialState IMXSerialState ; -#define IMX_SERIAL (obj) OBJECT_CHECK(IMXSerialState, (obj), TYPE_IMX_SERIAL) +DECLARE_INSTANCE_CHECKER (IMXSerialState,IMX_SERIAL , + TYPE_IMX_SERIAL)#define URXD_CHARRDY (1<<15)/* character read is valid */ #define URXD_ERR (1<<14)/* Character has error */
include/hw/char/nrf51_uart.h +2 -1
@@ -21,7 +21,8 @@#define TYPE_NRF51_UART "nrf51_soc.uart"typedef struct NRF51UARTState NRF51UARTState ; -#define NRF51_UART (obj) OBJECT_CHECK(NRF51UARTState, (obj), TYPE_NRF51_UART) +DECLARE_INSTANCE_CHECKER (NRF51UARTState,NRF51_UART , + TYPE_NRF51_UART) REG32(UART_STARTRX, 0x000)REG32 (UART_STOPRX ,0x004 )
include/hw/char/pl011.h +2 -1
@@ -23,7 +23,8 @@#define TYPE_PL011 "pl011"typedef struct PL011State PL011State ; -#define PL011 (obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011) +DECLARE_INSTANCE_CHECKER (PL011State,PL011 , +TYPE_PL011 ) /* This shares the same struct (and cast macro) as the base pl011 device */#define TYPE_PL011_LUMINARY "pl011_luminary"
include/hw/char/renesas_sci.h +2 -1
@@ -15,7 +15,8 @@#define TYPE_RENESAS_SCI "renesas-sci"typedef struct RSCIState RSCIState ; -#define RSCI (obj) OBJECT_CHECK(RSCIState, (obj), TYPE_RENESAS_SCI) +DECLARE_INSTANCE_CHECKER (RSCIState,RSCI , + TYPE_RENESAS_SCI)enum {ERI =0 ,
include/hw/char/serial.h +6 -3
@@ -104,13 +104,16 @@ extern const MemoryRegionOps serial_io_ops;void serial_set_frequency (SerialState *s,uint32_t frequency);#define TYPE_SERIAL "serial" -#define SERIAL (s) OBJECT_CHECK(SerialState, (s), TYPE_SERIAL) +DECLARE_INSTANCE_CHECKER (SerialState,SERIAL , + TYPE_SERIAL)#define TYPE_SERIAL_MM "serial-mm" -#define SERIAL_MM (s) OBJECT_CHECK(SerialMM, (s), TYPE_SERIAL_MM) +DECLARE_INSTANCE_CHECKER (SerialMM,SERIAL_MM , + TYPE_SERIAL_MM)#define TYPE_SERIAL_IO "serial-io" -#define SERIAL_IO (s) OBJECT_CHECK(SerialIO, (s), TYPE_SERIAL_IO) +DECLARE_INSTANCE_CHECKER (SerialIO,SERIAL_IO , + TYPE_SERIAL_IO) SerialMM *serial_mm_init(MemoryRegion *address_space, hwaddr base, int regshift,
include/hw/char/stm32f2xx_usart.h +2 -2
@@ -55,8 +55,8 @@#define TYPE_STM32F2XX_USART "stm32f2xx-usart"typedef struct STM32F2XXUsartState STM32F2XXUsartState ; -#define STM32F2XX_USART (obj) \ - OBJECT_CHECK(STM32F2XXUsartState, (obj), TYPE_STM32F2XX_USART) +DECLARE_INSTANCE_CHECKER (STM32F2XXUsartState,STM32F2XX_USART , + TYPE_STM32F2XX_USART)struct STM32F2XXUsartState {/* <private> */
include/hw/clock.h +2 -1
@@ -19,7 +19,8 @@#define TYPE_CLOCK "clock"typedef struct Clock Clock ; -#define CLOCK (obj) OBJECT_CHECK(Clock, (obj), TYPE_CLOCK) +DECLARE_INSTANCE_CHECKER (Clock,CLOCK , + TYPE_CLOCK)typedef void ClockCallback (void *opaque);
include/hw/core/cpu.h +2 -2
@@ -63,8 +63,8 @@ typedef uint64_t vaddr;#define CPU (obj) ((CPUState *)(obj))typedef struct CPUClass CPUClass ; -#define CPU_CLASS (class) OBJECT_CLASS_CHECK(CPUClass, (class), TYPE_CPU) -#define CPU_GET_CLASS (obj) OBJECT_GET_CLASS(CPUClass, (obj), TYPE_CPU) +DECLARE_CLASS_CHECKERS (CPUClass,CPU , + TYPE_CPU) typedef enum MMUAccessType { MMU_DATA_LOAD = 0,
include/hw/core/generic-loader.h +2 -2
@@ -43,7 +43,7 @@ struct GenericLoaderState {typedef struct GenericLoaderState GenericLoaderState ;#define TYPE_GENERIC_LOADER "loader" -#define GENERIC_LOADER (obj) OBJECT_CHECK(GenericLoaderState, (obj), \ - TYPE_GENERIC_LOADER) +DECLARE_INSTANCE_CHECKER (GenericLoaderState,GENERIC_LOADER , + TYPE_GENERIC_LOADER)#endif
include/hw/core/split-irq.h +2 -1
@@ -44,7 +44,8 @@typedef struct SplitIRQ SplitIRQ ; -#define SPLIT_IRQ (obj) OBJECT_CHECK(SplitIRQ, (obj), TYPE_SPLIT_IRQ) +DECLARE_INSTANCE_CHECKER (SplitIRQ,SPLIT_IRQ , + TYPE_SPLIT_IRQ)struct SplitIRQ {DeviceState parent_obj;
include/hw/cpu/a15mpcore.h +2 -2
@@ -28,8 +28,8 @@#define TYPE_A15MPCORE_PRIV "a15mpcore_priv"typedef struct A15MPPrivState A15MPPrivState ; -#define A15MPCORE_PRIV (obj) \ - OBJECT_CHECK(A15MPPrivState, (obj), TYPE_A15MPCORE_PRIV) +DECLARE_INSTANCE_CHECKER (A15MPPrivState,A15MPCORE_PRIV , + TYPE_A15MPCORE_PRIV)struct A15MPPrivState {/*< private >*/
include/hw/cpu/a9mpcore.h +2 -2
@@ -19,8 +19,8 @@#define TYPE_A9MPCORE_PRIV "a9mpcore_priv"typedef struct A9MPPrivState A9MPPrivState ; -#define A9MPCORE_PRIV (obj) \ - OBJECT_CHECK(A9MPPrivState, (obj), TYPE_A9MPCORE_PRIV) +DECLARE_INSTANCE_CHECKER (A9MPPrivState,A9MPCORE_PRIV , + TYPE_A9MPCORE_PRIV)struct A9MPPrivState {/*< private >*/
include/hw/cpu/arm11mpcore.h +2 -2
@@ -18,8 +18,8 @@#define TYPE_ARM11MPCORE_PRIV "arm11mpcore_priv"typedef struct ARM11MPCorePriveState ARM11MPCorePriveState ; -#define ARM11MPCORE_PRIV (obj) \ - OBJECT_CHECK(ARM11MPCorePriveState, (obj), TYPE_ARM11MPCORE_PRIV) +DECLARE_INSTANCE_CHECKER (ARM11MPCorePriveState,ARM11MPCORE_PRIV , + TYPE_ARM11MPCORE_PRIV)struct ARM11MPCorePriveState {SysBusDevice parent_obj;
include/hw/cpu/cluster.h +2 -2
@@ -56,8 +56,8 @@#define TYPE_CPU_CLUSTER "cpu-cluster"typedef struct CPUClusterState CPUClusterState ; -#define CPU_CLUSTER (obj) \ - OBJECT_CHECK(CPUClusterState, (obj), TYPE_CPU_CLUSTER) +DECLARE_INSTANCE_CHECKER (CPUClusterState,CPU_CLUSTER , +TYPE_CPU_CLUSTER )/* * This limit is imposed by TCG, which puts the cluster ID into an
include/hw/cpu/core.h +2 -2
@@ -15,8 +15,8 @@#define TYPE_CPU_CORE "cpu-core"typedef struct CPUCore CPUCore ; -#define CPU_CORE (obj) \ - OBJECT_CHECK(CPUCore, (obj), TYPE_CPU_CORE) +DECLARE_INSTANCE_CHECKER (CPUCore,CPU_CORE , + TYPE_CPU_CORE)struct CPUCore {/*< private >*/
include/hw/display/bcm2835_fb.h +2 -1
@@ -18,7 +18,8 @@#define TYPE_BCM2835_FB "bcm2835-fb"typedef struct BCM2835FBState BCM2835FBState ; -#define BCM2835_FB (obj) OBJECT_CHECK(BCM2835FBState, (obj), TYPE_BCM2835_FB) +DECLARE_INSTANCE_CHECKER (BCM2835FBState,BCM2835_FB , +TYPE_BCM2835_FB )/* * Configuration information about the fb which the guest can program
include/hw/display/dpcd.h +2 -1
@@ -29,7 +29,8 @@typedef struct DPCDState DPCDState ;#define TYPE_DPCD "dpcd" -#define DPCD (obj) OBJECT_CHECK(DPCDState, (obj), TYPE_DPCD) +DECLARE_INSTANCE_CHECKER (DPCDState,DPCD , +TYPE_DPCD ) /* DCPD Revision. */#define DPCD_REVISION 0x00
include/hw/display/i2c-ddc.h +2 -1
@@ -37,6 +37,7 @@ struct I2CDDCState {typedef struct I2CDDCState I2CDDCState ;#define TYPE_I2CDDC "i2c-ddc" -#define I2CDDC (obj) OBJECT_CHECK(I2CDDCState, (obj), TYPE_I2CDDC) +DECLARE_INSTANCE_CHECKER (I2CDDCState,I2CDDC , + TYPE_I2CDDC)#endif /* I2C_DDC_H */
include/hw/display/macfb.h +2 -2
@@ -33,8 +33,8 @@ typedef struct MacfbState {#define TYPE_MACFB "sysbus-macfb"typedef struct MacfbSysBusState MacfbSysBusState ; -#define MACFB (obj) \ - OBJECT_CHECK(MacfbSysBusState, (obj), TYPE_MACFB) +DECLARE_INSTANCE_CHECKER (MacfbSysBusState,MACFB , + TYPE_MACFB)struct MacfbSysBusState {SysBusDevice busdev;
include/hw/display/xlnx_dp.h +2 -1
@@ -106,6 +106,7 @@ struct XlnxDPState {typedef struct XlnxDPState XlnxDPState ;#define TYPE_XLNX_DP "xlnx.v-dp" -#define XLNX_DP (obj) OBJECT_CHECK(XlnxDPState, (obj), TYPE_XLNX_DP) +DECLARE_INSTANCE_CHECKER (XlnxDPState,XLNX_DP , + TYPE_XLNX_DP)#endif
include/hw/dma/bcm2835_dma.h +2 -2
@@ -27,8 +27,8 @@ typedef struct {#define TYPE_BCM2835_DMA "bcm2835-dma"typedef struct BCM2835DMAState BCM2835DMAState ; -#define BCM2835_DMA (obj) \ - OBJECT_CHECK(BCM2835DMAState, (obj), TYPE_BCM2835_DMA) +DECLARE_INSTANCE_CHECKER (BCM2835DMAState,BCM2835_DMA , + TYPE_BCM2835_DMA)#define BCM2835_DMA_NCHANS 16
include/hw/dma/i8257.h +2 -2
@@ -7,8 +7,8 @@#define TYPE_I8257 "i8257"typedef struct I8257State I8257State ; -#define I8257 (obj) \ - OBJECT_CHECK(I8257State, (obj), TYPE_I8257) +DECLARE_INSTANCE_CHECKER (I8257State,I8257 , + TYPE_I8257) typedef struct I8257Regs { int now[2];
include/hw/dma/pl080.h +2 -1
@@ -44,7 +44,8 @@ typedef struct {#define TYPE_PL080 "pl080"#define TYPE_PL081 "pl081"typedef struct PL080State PL080State ; -#define PL080 (obj) OBJECT_CHECK(PL080State, (obj), TYPE_PL080) +DECLARE_INSTANCE_CHECKER (PL080State,PL080 , + TYPE_PL080)struct PL080State {SysBusDevice parent_obj;
include/hw/dma/xlnx-zdma.h +2 -2
@@ -80,7 +80,7 @@ typedef struct XlnxZDMA XlnxZDMA;#define TYPE_XLNX_ZDMA "xlnx.zdma" -#define XLNX_ZDMA (obj) \ - OBJECT_CHECK(XlnxZDMA, (obj), TYPE_XLNX_ZDMA) +DECLARE_INSTANCE_CHECKER (XlnxZDMA,XLNX_ZDMA , + TYPE_XLNX_ZDMA)#endif /* XLNX_ZDMA_H */
include/hw/dma/xlnx-zynq-devcfg.h +2 -2
@@ -34,8 +34,8 @@#define TYPE_XLNX_ZYNQ_DEVCFG "xlnx.ps7-dev-cfg"typedef struct XlnxZynqDevcfg XlnxZynqDevcfg ; -#define XLNX_ZYNQ_DEVCFG (obj) \ - OBJECT_CHECK(XlnxZynqDevcfg, (obj), TYPE_XLNX_ZYNQ_DEVCFG) +DECLARE_INSTANCE_CHECKER (XlnxZynqDevcfg,XLNX_ZYNQ_DEVCFG , + TYPE_XLNX_ZYNQ_DEVCFG)#define XLNX_ZYNQ_DEVCFG_R_MAX (0x100 / 4)
include/hw/dma/xlnx_dpdma.h +2 -1
@@ -46,7 +46,8 @@ struct XlnxDPDMAState {typedef struct XlnxDPDMAState XlnxDPDMAState ;#define TYPE_XLNX_DPDMA "xlnx.dpdma" -#define XLNX_DPDMA (obj) OBJECT_CHECK(XlnxDPDMAState, (obj), TYPE_XLNX_DPDMA) +DECLARE_INSTANCE_CHECKER (XlnxDPDMAState,XLNX_DPDMA , +TYPE_XLNX_DPDMA )/* * xlnx_dpdma_start_operation: Start the operation on the specified channel. The
include/hw/fw-path-provider.h +2 -4
@@ -23,10 +23,8 @@#define TYPE_FW_PATH_PROVIDER "fw-path-provider"typedef struct FWPathProviderClass FWPathProviderClass ; -#define FW_PATH_PROVIDER_CLASS (klass) \ - OBJECT_CLASS_CHECK(FWPathProviderClass, (klass), TYPE_FW_PATH_PROVIDER) -#define FW_PATH_PROVIDER_GET_CLASS (obj) \ - OBJECT_GET_CLASS(FWPathProviderClass, (obj), TYPE_FW_PATH_PROVIDER) +DECLARE_CLASS_CHECKERS (FWPathProviderClass,FW_PATH_PROVIDER , + TYPE_FW_PATH_PROVIDER)#define FW_PATH_PROVIDER (obj) \ INTERFACE_CHECK(FWPathProvider, (obj), TYPE_FW_PATH_PROVIDER)
include/hw/gpio/aspeed_gpio.h +2 -5
@@ -16,11 +16,8 @@#define TYPE_ASPEED_GPIO "aspeed.gpio"typedef struct AspeedGPIOClass AspeedGPIOClass ;typedef struct AspeedGPIOState AspeedGPIOState ; -#define ASPEED_GPIO (obj) OBJECT_CHECK(AspeedGPIOState, (obj), TYPE_ASPEED_GPIO) -#define ASPEED_GPIO_CLASS (klass) \ - OBJECT_CLASS_CHECK(AspeedGPIOClass, (klass), TYPE_ASPEED_GPIO) -#define ASPEED_GPIO_GET_CLASS (obj) \ - OBJECT_GET_CLASS(AspeedGPIOClass, (obj), TYPE_ASPEED_GPIO) +DECLARE_OBJ_CHECKERS (AspeedGPIOState, AspeedGPIOClass, + ASPEED_GPIO, TYPE_ASPEED_GPIO)#define ASPEED_GPIO_MAX_NR_SETS 8#define ASPEED_REGS_PER_BANK 14
include/hw/gpio/bcm2835_gpio.h +2 -2
@@ -36,7 +36,7 @@ struct BCM2835GpioState {typedef struct BCM2835GpioState BCM2835GpioState ;#define TYPE_BCM2835_GPIO "bcm2835_gpio" -#define BCM2835_GPIO (obj) \ - OBJECT_CHECK(BCM2835GpioState, (obj), TYPE_BCM2835_GPIO) +DECLARE_INSTANCE_CHECKER (BCM2835GpioState,BCM2835_GPIO , + TYPE_BCM2835_GPIO)#endif
include/hw/gpio/imx_gpio.h +2 -1
@@ -25,7 +25,8 @@#define TYPE_IMX_GPIO "imx.gpio"typedef struct IMXGPIOState IMXGPIOState ; -#define IMX_GPIO (obj) OBJECT_CHECK(IMXGPIOState, (obj), TYPE_IMX_GPIO) +DECLARE_INSTANCE_CHECKER (IMXGPIOState,IMX_GPIO , + TYPE_IMX_GPIO)#define IMX_GPIO_MEM_SIZE 0x20
include/hw/gpio/nrf51_gpio.h +2 -1
@@ -30,7 +30,8 @@#include "qom/object.h" #define TYPE_NRF51_GPIO "nrf51_soc.gpio"typedef struct NRF51GPIOState NRF51GPIOState ; -#define NRF51_GPIO (obj) OBJECT_CHECK(NRF51GPIOState, (obj), TYPE_NRF51_GPIO) +DECLARE_INSTANCE_CHECKER (NRF51GPIOState,NRF51_GPIO , + TYPE_NRF51_GPIO)#define NRF51_GPIO_PINS 32
include/hw/hotplug.h +2 -4
@@ -17,10 +17,8 @@#define TYPE_HOTPLUG_HANDLER "hotplug-handler"typedef struct HotplugHandlerClass HotplugHandlerClass ; -#define HOTPLUG_HANDLER_CLASS (klass) \ - OBJECT_CLASS_CHECK(HotplugHandlerClass, (klass), TYPE_HOTPLUG_HANDLER) -#define HOTPLUG_HANDLER_GET_CLASS (obj) \ - OBJECT_GET_CLASS(HotplugHandlerClass, (obj), TYPE_HOTPLUG_HANDLER) +DECLARE_CLASS_CHECKERS (HotplugHandlerClass,HOTPLUG_HANDLER , + TYPE_HOTPLUG_HANDLER)#define HOTPLUG_HANDLER (obj) \ INTERFACE_CHECK(HotplugHandler, (obj), TYPE_HOTPLUG_HANDLER)
include/hw/hyperv/vmbus-bridge.h +2 -1
@@ -25,7 +25,8 @@ struct VMBusBridge { };typedef struct VMBusBridge VMBusBridge ; -#define VMBUS_BRIDGE (obj) OBJECT_CHECK(VMBusBridge, (obj), TYPE_VMBUS_BRIDGE) +DECLARE_INSTANCE_CHECKER (VMBusBridge,VMBUS_BRIDGE , + TYPE_VMBUS_BRIDGE)static inline VMBusBridge *vmbus_bridge_find (void ) {
include/hw/hyperv/vmbus.h +4 -7
@@ -22,16 +22,13 @@typedef struct VMBusDevice VMBusDevice ;typedef struct VMBusDeviceClass VMBusDeviceClass ; -#define VMBUS_DEVICE (obj) \ - OBJECT_CHECK(VMBusDevice, (obj), TYPE_VMBUS_DEVICE) -#define VMBUS_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(VMBusDeviceClass, (klass), TYPE_VMBUS_DEVICE) -#define VMBUS_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(VMBusDeviceClass, (obj), TYPE_VMBUS_DEVICE) +DECLARE_OBJ_CHECKERS (VMBusDevice, VMBusDeviceClass, + VMBUS_DEVICE, TYPE_VMBUS_DEVICE)#define TYPE_VMBUS "vmbus"typedef struct VMBus VMBus ; -#define VMBUS (obj) OBJECT_CHECK(VMBus, (obj), TYPE_VMBUS) +DECLARE_INSTANCE_CHECKER (VMBus,VMBUS , +TYPE_VMBUS )/* * Object wrapping a GPADL -- GPA Descriptor List -- an array of guest physical
include/hw/i2c/arm_sbcon_i2c.h +2 -2
@@ -20,8 +20,8 @@#define TYPE_ARM_SBCON_I2C TYPE_VERSATILE_I2Ctypedef struct ArmSbconI2CState ArmSbconI2CState ; -#define ARM_SBCON_I2C (obj) \ - OBJECT_CHECK(ArmSbconI2CState, (obj), TYPE_ARM_SBCON_I2C) +DECLARE_INSTANCE_CHECKER (ArmSbconI2CState,ARM_SBCON_I2C , + TYPE_ARM_SBCON_I2C)struct ArmSbconI2CState {/*< private >*/
include/hw/i2c/aspeed_i2c.h +2 -6
@@ -31,8 +31,8 @@#define TYPE_ASPEED_2600_I2C TYPE_ASPEED_I2C "-ast2600"typedef struct AspeedI2CClass AspeedI2CClass ;typedef struct AspeedI2CState AspeedI2CState ; -#define ASPEED_I2C (obj) \ - OBJECT_CHECK(AspeedI2CState, (obj), TYPE_ASPEED_I2C) +DECLARE_OBJ_CHECKERS (AspeedI2CState, AspeedI2CClass, + ASPEED_I2C, TYPE_ASPEED_I2C)#define ASPEED_I2C_NR_BUSSES 16#define ASPEED_I2C_MAX_POOL_SIZE 0x800
@@ -75,10 +75,6 @@ struct AspeedI2CState {AddressSpace dram_as; }; -#define ASPEED_I2C_CLASS (klass) \ - OBJECT_CLASS_CHECK(AspeedI2CClass, (klass), TYPE_ASPEED_I2C) -#define ASPEED_I2C_GET_CLASS (obj) \ - OBJECT_GET_CLASS(AspeedI2CClass, (obj), TYPE_ASPEED_I2C)struct AspeedI2CClass {SysBusDeviceClass parent_class;
include/hw/i2c/i2c.h +4 -7
@@ -20,12 +20,8 @@ typedef struct I2CSlave I2CSlave;#define TYPE_I2C_SLAVE "i2c-slave"typedef struct I2CSlaveClass I2CSlaveClass ; -#define I2C_SLAVE (obj) \ - OBJECT_CHECK(I2CSlave, (obj), TYPE_I2C_SLAVE) -#define I2C_SLAVE_CLASS (klass) \ - OBJECT_CLASS_CHECK(I2CSlaveClass, (klass), TYPE_I2C_SLAVE) -#define I2C_SLAVE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(I2CSlaveClass, (obj), TYPE_I2C_SLAVE) +DECLARE_OBJ_CHECKERS (I2CSlave, I2CSlaveClass, + I2C_SLAVE, TYPE_I2C_SLAVE)struct I2CSlaveClass {DeviceClass parent_class;
@@ -55,7 +51,8 @@ struct I2CSlave { };#define TYPE_I2C_BUS "i2c-bus" -#define I2C_BUS (obj) OBJECT_CHECK(I2CBus, (obj), TYPE_I2C_BUS) +DECLARE_INSTANCE_CHECKER (I2CBus,I2C_BUS , + TYPE_I2C_BUS)typedef struct I2CNode I2CNode ;
include/hw/i2c/imx_i2c.h +2 -1
@@ -26,7 +26,8 @@#define TYPE_IMX_I2C "imx.i2c"typedef struct IMXI2CState IMXI2CState ; -#define IMX_I2C (obj) OBJECT_CHECK(IMXI2CState, (obj), TYPE_IMX_I2C) +DECLARE_INSTANCE_CHECKER (IMXI2CState,IMX_I2C , + TYPE_IMX_I2C)#define IMX_I2C_MEM_SIZE 0x14
include/hw/i2c/microbit_i2c.h +2 -2
@@ -28,8 +28,8 @@#define TYPE_MICROBIT_I2C "microbit.i2c"typedef struct MicrobitI2CState MicrobitI2CState ; -#define MICROBIT_I2C (obj) \ - OBJECT_CHECK(MicrobitI2CState, (obj), TYPE_MICROBIT_I2C) +DECLARE_INSTANCE_CHECKER (MicrobitI2CState,MICROBIT_I2C , + TYPE_MICROBIT_I2C)#define MICROBIT_I2C_NREGS (NRF51_PERIPHERAL_SIZE / sizeof(uint32_t))
include/hw/i2c/ppc4xx_i2c.h +2 -1
@@ -33,7 +33,8 @@#define TYPE_PPC4xx_I2C "ppc4xx-i2c"typedef struct PPC4xxI2CState PPC4xxI2CState ; -#define PPC4xx_I2C (obj) OBJECT_CHECK(PPC4xxI2CState, (obj), TYPE_PPC4xx_I2C) +DECLARE_INSTANCE_CHECKER (PPC4xxI2CState, PPC4xx_I2C, + TYPE_PPC4xx_I2C)struct PPC4xxI2CState {/*< private >*/
include/hw/i2c/smbus_slave.h +2 -6
@@ -31,12 +31,8 @@#define TYPE_SMBUS_DEVICE "smbus-device"typedef struct SMBusDevice SMBusDevice ;typedef struct SMBusDeviceClass SMBusDeviceClass ; -#define SMBUS_DEVICE (obj) \ - OBJECT_CHECK(SMBusDevice, (obj), TYPE_SMBUS_DEVICE) -#define SMBUS_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(SMBusDeviceClass, (klass), TYPE_SMBUS_DEVICE) -#define SMBUS_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(SMBusDeviceClass, (obj), TYPE_SMBUS_DEVICE) +DECLARE_OBJ_CHECKERS (SMBusDevice, SMBusDeviceClass, + SMBUS_DEVICE, TYPE_SMBUS_DEVICE)struct SMBusDeviceClass {
include/hw/i386/apic_internal.h +2 -6
@@ -127,12 +127,8 @@ typedef struct APICCommonState APICCommonState;#define TYPE_APIC_COMMON "apic-common"typedef struct APICCommonClass APICCommonClass ; -#define APIC_COMMON (obj) \ - OBJECT_CHECK(APICCommonState, (obj), TYPE_APIC_COMMON) -#define APIC_COMMON_CLASS (klass) \ - OBJECT_CLASS_CHECK(APICCommonClass, (klass), TYPE_APIC_COMMON) -#define APIC_COMMON_GET_CLASS (obj) \ - OBJECT_GET_CLASS(APICCommonClass, (obj), TYPE_APIC_COMMON) +DECLARE_OBJ_CHECKERS (APICCommonState, APICCommonClass, + APIC_COMMON, TYPE_APIC_COMMON)struct APICCommonClass {DeviceClass parent_class;
include/hw/i386/ich9.h +2 -2
@@ -25,8 +25,8 @@ void ich9_generate_smi(void);#define TYPE_ICH9_LPC_DEVICE "ICH9-LPC"typedef struct ICH9LPCState ICH9LPCState ; -#define ICH9_LPC_DEVICE (obj) \ - OBJECT_CHECK(ICH9LPCState, (obj), TYPE_ICH9_LPC_DEVICE) +DECLARE_INSTANCE_CHECKER (ICH9LPCState,ICH9_LPC_DEVICE , + TYPE_ICH9_LPC_DEVICE)struct ICH9LPCState {/* ICH9 LPC PCI to ISA bridge */
include/hw/i386/intel_iommu.h +2 -2
@@ -28,8 +28,8 @@#define TYPE_INTEL_IOMMU_DEVICE "intel-iommu"typedef struct IntelIOMMUState IntelIOMMUState ; -#define INTEL_IOMMU_DEVICE (obj) \ - OBJECT_CHECK(IntelIOMMUState, (obj), TYPE_INTEL_IOMMU_DEVICE) +DECLARE_INSTANCE_CHECKER (IntelIOMMUState,INTEL_IOMMU_DEVICE , + TYPE_INTEL_IOMMU_DEVICE)#define TYPE_INTEL_IOMMU_MEMORY_REGION "intel-iommu-iommu-memory-region"
include/hw/i386/ioapic_internal.h +2 -6
@@ -86,12 +86,8 @@ typedef struct IOAPICCommonState IOAPICCommonState;#define TYPE_IOAPIC_COMMON "ioapic-common"typedef struct IOAPICCommonClass IOAPICCommonClass ; -#define IOAPIC_COMMON (obj) \ - OBJECT_CHECK(IOAPICCommonState, (obj), TYPE_IOAPIC_COMMON) -#define IOAPIC_COMMON_CLASS (klass) \ - OBJECT_CLASS_CHECK(IOAPICCommonClass, (klass), TYPE_IOAPIC_COMMON) -#define IOAPIC_COMMON_GET_CLASS (obj) \ - OBJECT_GET_CLASS(IOAPICCommonClass, (obj), TYPE_IOAPIC_COMMON) +DECLARE_OBJ_CHECKERS (IOAPICCommonState, IOAPICCommonClass, + IOAPIC_COMMON, TYPE_IOAPIC_COMMON)struct IOAPICCommonClass {SysBusDeviceClass parent_class;
include/hw/i386/microvm.h +2 -6
@@ -64,11 +64,7 @@ struct MicrovmMachineState {typedef struct MicrovmMachineState MicrovmMachineState ;#define TYPE_MICROVM_MACHINE MACHINE_TYPE_NAME("microvm") -#define MICROVM_MACHINE (obj) \ - OBJECT_CHECK(MicrovmMachineState, (obj), TYPE_MICROVM_MACHINE) -#define MICROVM_MACHINE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(MicrovmMachineClass, obj, TYPE_MICROVM_MACHINE) -#define MICROVM_MACHINE_CLASS (class) \ - OBJECT_CLASS_CHECK(MicrovmMachineClass, class, TYPE_MICROVM_MACHINE) +DECLARE_OBJ_CHECKERS (MicrovmMachineState, MicrovmMachineClass, + MICROVM_MACHINE, TYPE_MICROVM_MACHINE)#endif
include/hw/i386/pc.h +2 -6
@@ -123,12 +123,8 @@ struct PCMachineClass {typedef struct PCMachineClass PCMachineClass ;#define TYPE_PC_MACHINE "generic-pc-machine" -#define PC_MACHINE (obj) \ - OBJECT_CHECK(PCMachineState, (obj), TYPE_PC_MACHINE) -#define PC_MACHINE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(PCMachineClass, (obj), TYPE_PC_MACHINE) -#define PC_MACHINE_CLASS (klass) \ - OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE) +DECLARE_OBJ_CHECKERS (PCMachineState, PCMachineClass, +PC_MACHINE ,TYPE_PC_MACHINE )/* ioapic.c */
include/hw/i386/x86.h +2 -6
@@ -86,12 +86,8 @@ typedef struct X86MachineState X86MachineState;#define X86_MACHINE_ACPI "acpi"#define TYPE_X86_MACHINE MACHINE_TYPE_NAME("x86") -#define X86_MACHINE (obj) \ - OBJECT_CHECK(X86MachineState, (obj), TYPE_X86_MACHINE) -#define X86_MACHINE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(X86MachineClass, obj, TYPE_X86_MACHINE) -#define X86_MACHINE_CLASS (class) \ - OBJECT_CLASS_CHECK(X86MachineClass, class, TYPE_X86_MACHINE) +DECLARE_OBJ_CHECKERS (X86MachineState, X86MachineClass, + X86_MACHINE, TYPE_X86_MACHINE)void init_topo_info (X86CPUTopoInfo *topo_info,const X86MachineState *x86ms);
include/hw/ide/ahci.h +6 -5
@@ -54,15 +54,16 @@ typedef struct AHCIState {typedef struct AHCIPCIState AHCIPCIState ;#define TYPE_ICH9_AHCI "ich9-ahci" -#define ICH_AHCI (obj) \ - OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI) +DECLARE_INSTANCE_CHECKER (AHCIPCIState,ICH_AHCI , + TYPE_ICH9_AHCI)int32_t ahci_get_num_ports (PCIDevice *dev);void ahci_ide_create_devs (PCIDevice *dev,DriveInfo **hd);#define TYPE_SYSBUS_AHCI "sysbus-ahci"typedef struct SysbusAHCIState SysbusAHCIState ; -#define SYSBUS_AHCI (obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI) +DECLARE_INSTANCE_CHECKER (SysbusAHCIState,SYSBUS_AHCI , + TYPE_SYSBUS_AHCI)struct SysbusAHCIState {/*< private >*/
@@ -75,8 +76,8 @@ struct SysbusAHCIState {#define TYPE_ALLWINNER_AHCI "allwinner-ahci"typedef struct AllwinnerAHCIState AllwinnerAHCIState ; -#define ALLWINNER_AHCI (obj) \ - OBJECT_CHECK(AllwinnerAHCIState, (obj), TYPE_ALLWINNER_AHCI) +DECLARE_INSTANCE_CHECKER (AllwinnerAHCIState,ALLWINNER_AHCI , + TYPE_ALLWINNER_AHCI)#define ALLWINNER_AHCI_MMIO_OFF 0x80#define ALLWINNER_AHCI_MMIO_SIZE 0x80
include/hw/ide/internal.h +4 -7
@@ -26,7 +26,8 @@ typedef struct IDEDMA IDEDMA;typedef struct IDEDMAOps IDEDMAOps ;#define TYPE_IDE_BUS "IDE" -#define IDE_BUS (obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS) +DECLARE_INSTANCE_CHECKER (IDEBus,IDE_BUS , + TYPE_IDE_BUS)#define MAX_IDE_DEVS 2
@@ -488,12 +489,8 @@ struct IDEBus {#define TYPE_IDE_DEVICE "ide-device"typedef struct IDEDeviceClass IDEDeviceClass ; -#define IDE_DEVICE (obj) \ - OBJECT_CHECK(IDEDevice, (obj), TYPE_IDE_DEVICE) -#define IDE_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(IDEDeviceClass, (klass), TYPE_IDE_DEVICE) -#define IDE_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(IDEDeviceClass, (obj), TYPE_IDE_DEVICE) +DECLARE_OBJ_CHECKERS (IDEDevice, IDEDeviceClass, + IDE_DEVICE, TYPE_IDE_DEVICE)struct IDEDeviceClass {DeviceClass parent_class;
include/hw/ide/pci.h +2 -1
@@ -41,7 +41,8 @@ typedef struct BMDMAState {#define TYPE_PCI_IDE "pci-ide"typedef struct PCIIDEState PCIIDEState ; -#define PCI_IDE (obj) OBJECT_CHECK(PCIIDEState, (obj), TYPE_PCI_IDE) +DECLARE_INSTANCE_CHECKER (PCIIDEState,PCI_IDE , + TYPE_PCI_IDE)struct PCIIDEState {/*< private >*/
include/hw/input/adb.h +4 -6
@@ -44,7 +44,8 @@ typedef bool ADBDeviceHasData(ADBDevice *d);#define TYPE_ADB_DEVICE "adb-device"typedef struct ADBDeviceClass ADBDeviceClass ; -#define ADB_DEVICE (obj) OBJECT_CHECK(ADBDevice, (obj), TYPE_ADB_DEVICE) +DECLARE_OBJ_CHECKERS (ADBDevice, ADBDeviceClass, + ADB_DEVICE, TYPE_ADB_DEVICE)struct ADBDevice {/*< private >*/
@@ -55,10 +56,6 @@ struct ADBDevice {int handler; }; -#define ADB_DEVICE_CLASS (cls) \ - OBJECT_CLASS_CHECK(ADBDeviceClass, (cls), TYPE_ADB_DEVICE) -#define ADB_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ADBDeviceClass, (obj), TYPE_ADB_DEVICE)struct ADBDeviceClass {/*< private >*/
@@ -70,7 +67,8 @@ struct ADBDeviceClass { };#define TYPE_ADB_BUS "apple-desktop-bus" -#define ADB_BUS (obj) OBJECT_CHECK(ADBBusState, (obj), TYPE_ADB_BUS) +DECLARE_INSTANCE_CHECKER (ADBBusState,ADB_BUS , + TYPE_ADB_BUS)#define ADB_STATUS_BUSTIMEOUT 0x1#define ADB_STATUS_POLLREPLY 0x2
include/hw/input/i8042.h +2 -1
@@ -13,7 +13,8 @@#define TYPE_I8042 "i8042"typedef struct ISAKBDState ISAKBDState ; -#define I8042 (obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042) +DECLARE_INSTANCE_CHECKER (ISAKBDState,I8042 , + TYPE_I8042)#define I8042_A20_LINE "a20"
include/hw/intc/allwinner-a10-pic.h +2 -1
@@ -6,7 +6,8 @@#define TYPE_AW_A10_PIC "allwinner-a10-pic"typedef struct AwA10PICState AwA10PICState ; -#define AW_A10_PIC (obj) OBJECT_CHECK(AwA10PICState, (obj), TYPE_AW_A10_PIC) +DECLARE_INSTANCE_CHECKER (AwA10PICState,AW_A10_PIC , + TYPE_AW_A10_PIC)#define AW_A10_PIC_VECTOR 0#define AW_A10_PIC_BASE_ADDR 4
include/hw/intc/arm_gic_common.h +2 -6
@@ -149,12 +149,8 @@ typedef struct GICState GICState;#define TYPE_ARM_GIC_COMMON "arm_gic_common"typedef struct ARMGICCommonClass ARMGICCommonClass ; -#define ARM_GIC_COMMON (obj) \ - OBJECT_CHECK(GICState, (obj), TYPE_ARM_GIC_COMMON) -#define ARM_GIC_COMMON_CLASS (klass) \ - OBJECT_CLASS_CHECK(ARMGICCommonClass, (klass), TYPE_ARM_GIC_COMMON) -#define ARM_GIC_COMMON_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ARMGICCommonClass, (obj), TYPE_ARM_GIC_COMMON) +DECLARE_OBJ_CHECKERS (GICState, ARMGICCommonClass, + ARM_GIC_COMMON, TYPE_ARM_GIC_COMMON)struct ARMGICCommonClass {/*< private >*/
include/hw/intc/arm_gicv3_common.h +2 -6
@@ -281,12 +281,8 @@ GICV3_BITMAP_ACCESSORS(edge_trigger)#define TYPE_ARM_GICV3_COMMON "arm-gicv3-common"typedef struct ARMGICv3CommonClass ARMGICv3CommonClass ; -#define ARM_GICV3_COMMON (obj) \ - OBJECT_CHECK(GICv3State, (obj), TYPE_ARM_GICV3_COMMON) -#define ARM_GICV3_COMMON_CLASS (klass) \ - OBJECT_CLASS_CHECK(ARMGICv3CommonClass, (klass), TYPE_ARM_GICV3_COMMON) -#define ARM_GICV3_COMMON_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ARMGICv3CommonClass, (obj), TYPE_ARM_GICV3_COMMON) +DECLARE_OBJ_CHECKERS (GICv3State, ARMGICv3CommonClass, + ARM_GICV3_COMMON, TYPE_ARM_GICV3_COMMON)struct ARMGICv3CommonClass {/*< private >*/
include/hw/intc/arm_gicv3_its_common.h +2 -6
@@ -66,12 +66,8 @@ void gicv3_its_init_mmio(GICv3ITSState *s, const MemoryRegionOps *ops);#define TYPE_ARM_GICV3_ITS_COMMON "arm-gicv3-its-common"typedef struct GICv3ITSCommonClass GICv3ITSCommonClass ; -#define ARM_GICV3_ITS_COMMON (obj) \ - OBJECT_CHECK(GICv3ITSState, (obj), TYPE_ARM_GICV3_ITS_COMMON) -#define ARM_GICV3_ITS_COMMON_CLASS (klass) \ - OBJECT_CLASS_CHECK(GICv3ITSCommonClass, (klass), TYPE_ARM_GICV3_ITS_COMMON) -#define ARM_GICV3_ITS_COMMON_GET_CLASS (obj) \ - OBJECT_GET_CLASS(GICv3ITSCommonClass, (obj), TYPE_ARM_GICV3_ITS_COMMON) +DECLARE_OBJ_CHECKERS (GICv3ITSState, GICv3ITSCommonClass, + ARM_GICV3_ITS_COMMON, TYPE_ARM_GICV3_ITS_COMMON)struct GICv3ITSCommonClass {/*< private >*/
include/hw/intc/armv7m_nvic.h +2 -2
@@ -18,8 +18,8 @@#define TYPE_NVIC "armv7m_nvic"typedef struct NVICState NVICState ; -#define NVIC (obj) \ - OBJECT_CHECK(NVICState, (obj), TYPE_NVIC) +DECLARE_INSTANCE_CHECKER (NVICState,NVIC , +TYPE_NVIC ) /* Highest permitted number of exceptions (architectural limit) */#define NVIC_MAX_VECTORS 512
include/hw/intc/aspeed_vic.h +2 -1
@@ -18,7 +18,8 @@#define TYPE_ASPEED_VIC "aspeed.vic"typedef struct AspeedVICState AspeedVICState ; -#define ASPEED_VIC (obj) OBJECT_CHECK(AspeedVICState, (obj), TYPE_ASPEED_VIC) +DECLARE_INSTANCE_CHECKER (AspeedVICState,ASPEED_VIC , + TYPE_ASPEED_VIC)#define ASPEED_VIC_NR_IRQS 51
include/hw/intc/bcm2835_ic.h +2 -1
@@ -13,7 +13,8 @@#define TYPE_BCM2835_IC "bcm2835-ic"typedef struct BCM2835ICState BCM2835ICState ; -#define BCM2835_IC (obj) OBJECT_CHECK(BCM2835ICState, (obj), TYPE_BCM2835_IC) +DECLARE_INSTANCE_CHECKER (BCM2835ICState,BCM2835_IC , + TYPE_BCM2835_IC)#define BCM2835_IC_GPU_IRQ "gpu-irq"#define BCM2835_IC_ARM_IRQ "arm-irq"
include/hw/intc/bcm2836_control.h +2 -2
@@ -25,8 +25,8 @@#define TYPE_BCM2836_CONTROL "bcm2836-control"typedef struct BCM2836ControlState BCM2836ControlState ; -#define BCM2836_CONTROL (obj) \ - OBJECT_CHECK(BCM2836ControlState, (obj), TYPE_BCM2836_CONTROL) +DECLARE_INSTANCE_CHECKER (BCM2836ControlState,BCM2836_CONTROL , + TYPE_BCM2836_CONTROL)struct BCM2836ControlState {/*< private >*/
include/hw/intc/heathrow_pic.h +2 -1
@@ -31,7 +31,8 @@#define TYPE_HEATHROW "heathrow"typedef struct HeathrowState HeathrowState ; -#define HEATHROW (obj) OBJECT_CHECK(HeathrowState, (obj), TYPE_HEATHROW) +DECLARE_INSTANCE_CHECKER (HeathrowState,HEATHROW , + TYPE_HEATHROW) typedef struct HeathrowPICState { uint32_t events;
include/hw/intc/ibex_plic.h +2 -2
@@ -24,8 +24,8 @@#define TYPE_IBEX_PLIC "ibex-plic"typedef struct IbexPlicState IbexPlicState ; -#define IBEX_PLIC (obj) \ - OBJECT_CHECK(IbexPlicState, (obj), TYPE_IBEX_PLIC) +DECLARE_INSTANCE_CHECKER (IbexPlicState,IBEX_PLIC , + TYPE_IBEX_PLIC)struct IbexPlicState {/*< private >*/
include/hw/intc/imx_avic.h +2 -1
@@ -22,7 +22,8 @@#define TYPE_IMX_AVIC "imx.avic"typedef struct IMXAVICState IMXAVICState ; -#define IMX_AVIC (obj) OBJECT_CHECK(IMXAVICState, (obj), TYPE_IMX_AVIC) +DECLARE_INSTANCE_CHECKER (IMXAVICState,IMX_AVIC , + TYPE_IMX_AVIC)#define IMX_AVIC_NUM_IRQS 64
include/hw/intc/imx_gpcv2.h +2 -1
@@ -19,6 +19,7 @@ struct IMXGPCv2State {typedef struct IMXGPCv2State IMXGPCv2State ;#define TYPE_IMX_GPCV2 "imx-gpcv2" -#define IMX_GPCV2 (obj) OBJECT_CHECK(IMXGPCv2State, (obj), TYPE_IMX_GPCV2) +DECLARE_INSTANCE_CHECKER (IMXGPCv2State,IMX_GPCV2 , + TYPE_IMX_GPCV2)#endif /* IMX_GPCV2_H */
include/hw/intc/intc.h +1 -5
@@ -6,12 +6,8 @@#define TYPE_INTERRUPT_STATS_PROVIDER "intctrl"typedef struct InterruptStatsProviderClass InterruptStatsProviderClass ; -#define INTERRUPT_STATS_PROVIDER_CLASS (klass) \ - OBJECT_CLASS_CHECK(InterruptStatsProviderClass, (klass), \ +DECLARE_CLASS_CHECKERS (InterruptStatsProviderClass,INTERRUPT_STATS_PROVIDER , TYPE_INTERRUPT_STATS_PROVIDER) -#define INTERRUPT_STATS_PROVIDER_GET_CLASS (obj) \ - OBJECT_GET_CLASS(InterruptStatsProviderClass, (obj), \ - TYPE_INTERRUPT_STATS_PROVIDER)#define INTERRUPT_STATS_PROVIDER (obj) \ INTERFACE_CHECK(InterruptStatsProvider, (obj), \ TYPE_INTERRUPT_STATS_PROVIDER)
include/hw/intc/mips_gic.h +2 -1
@@ -172,7 +172,8 @@#define TYPE_MIPS_GIC "mips-gic"typedef struct MIPSGICState MIPSGICState ; -#define MIPS_GIC (obj) OBJECT_CHECK(MIPSGICState, (obj), TYPE_MIPS_GIC) +DECLARE_INSTANCE_CHECKER (MIPSGICState,MIPS_GIC , +TYPE_MIPS_GIC ) /* Support up to 32 VPs and 256 IRQs */#define GIC_MAX_VPS 32
include/hw/intc/realview_gic.h +2 -2
@@ -16,8 +16,8 @@#define TYPE_REALVIEW_GIC "realview_gic"typedef struct RealViewGICState RealViewGICState ; -#define REALVIEW_GIC (obj) \ - OBJECT_CHECK(RealViewGICState, (obj), TYPE_REALVIEW_GIC) +DECLARE_INSTANCE_CHECKER (RealViewGICState,REALVIEW_GIC , + TYPE_REALVIEW_GIC)struct RealViewGICState {SysBusDevice parent_obj;
include/hw/intc/rx_icu.h +2 -1
@@ -72,6 +72,7 @@ struct RXICUState {typedef struct RXICUState RXICUState ;#define TYPE_RX_ICU "rx-icu" -#define RX_ICU (obj) OBJECT_CHECK(RXICUState, (obj), TYPE_RX_ICU) +DECLARE_INSTANCE_CHECKER (RXICUState,RX_ICU , + TYPE_RX_ICU)#endif /* RX_ICU_H */
include/hw/intc/xlnx-pmu-iomod-intc.h +2 -2
@@ -32,8 +32,8 @@#define TYPE_XLNX_PMU_IO_INTC "xlnx.pmu_io_intc"typedef struct XlnxPMUIOIntc XlnxPMUIOIntc ; -#define XLNX_PMU_IO_INTC (obj) \ - OBJECT_CHECK(XlnxPMUIOIntc, (obj), TYPE_XLNX_PMU_IO_INTC) +DECLARE_INSTANCE_CHECKER (XlnxPMUIOIntc,XLNX_PMU_IO_INTC , +TYPE_XLNX_PMU_IO_INTC ) /* This is R_PIT3_CONTROL + 1 */#define XLNXPMUIOINTC_R_MAX (0x78 + 1)
include/hw/intc/xlnx-zynqmp-ipi.h +2 -2
@@ -32,8 +32,8 @@#define TYPE_XLNX_ZYNQMP_IPI "xlnx.zynqmp_ipi"typedef struct XlnxZynqMPIPI XlnxZynqMPIPI ; -#define XLNX_ZYNQMP_IPI (obj) \ - OBJECT_CHECK(XlnxZynqMPIPI, (obj), TYPE_XLNX_ZYNQMP_IPI) +DECLARE_INSTANCE_CHECKER (XlnxZynqMPIPI,XLNX_ZYNQMP_IPI , +TYPE_XLNX_ZYNQMP_IPI ) /* This is R_IPI_IDR + 1 */#define R_XLNX_ZYNQMP_IPI_MAX ((0x1c / 4) + 1)
include/hw/ipack/ipack.h +4 -7
@@ -17,7 +17,8 @@typedef struct IPackBus IPackBus ;#define TYPE_IPACK_BUS "IndustryPack" -#define IPACK_BUS (obj) OBJECT_CHECK(IPackBus, (obj), TYPE_IPACK_BUS) +DECLARE_INSTANCE_CHECKER (IPackBus,IPACK_BUS , + TYPE_IPACK_BUS)struct IPackBus {/*< private >*/
@@ -33,12 +34,8 @@ typedef struct IPackDevice IPackDevice;typedef struct IPackDeviceClass IPackDeviceClass ;#define TYPE_IPACK_DEVICE "ipack-device" -#define IPACK_DEVICE (obj) \ - OBJECT_CHECK(IPackDevice, (obj), TYPE_IPACK_DEVICE) -#define IPACK_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(IPackDeviceClass, (klass), TYPE_IPACK_DEVICE) -#define IPACK_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(IPackDeviceClass, (obj), TYPE_IPACK_DEVICE) +DECLARE_OBJ_CHECKERS (IPackDevice, IPackDeviceClass, + IPACK_DEVICE, TYPE_IPACK_DEVICE)struct IPackDeviceClass {/*< private >*/
include/hw/ipmi/ipmi.h +6 -12
@@ -111,10 +111,8 @@ uint32_t ipmi_next_uuid(void);#define IPMI_INTERFACE (obj) \ INTERFACE_CHECK(IPMIInterface, (obj), TYPE_IPMI_INTERFACE)typedef struct IPMIInterfaceClass IPMIInterfaceClass ; -#define IPMI_INTERFACE_CLASS (class) \ - OBJECT_CLASS_CHECK(IPMIInterfaceClass, (class), TYPE_IPMI_INTERFACE) -#define IPMI_INTERFACE_GET_CLASS (class) \ - OBJECT_GET_CLASS(IPMIInterfaceClass, (class), TYPE_IPMI_INTERFACE) +DECLARE_CLASS_CHECKERS (IPMIInterfaceClass,IPMI_INTERFACE , + TYPE_IPMI_INTERFACE)typedef struct IPMIInterface IPMIInterface ;
@@ -179,12 +177,8 @@ struct IPMIInterfaceClass {#define TYPE_IPMI_BMC "ipmi-bmc"typedef struct IPMIBmc IPMIBmc ;typedef struct IPMIBmcClass IPMIBmcClass ; -#define IPMI_BMC (obj) \ - OBJECT_CHECK(IPMIBmc, (obj), TYPE_IPMI_BMC) -#define IPMI_BMC_CLASS (obj_class) \ - OBJECT_CLASS_CHECK(IPMIBmcClass, (obj_class), TYPE_IPMI_BMC) -#define IPMI_BMC_GET_CLASS (obj) \ - OBJECT_GET_CLASS(IPMIBmcClass, (obj), TYPE_IPMI_BMC) +DECLARE_OBJ_CHECKERS (IPMIBmc, IPMIBmcClass, + IPMI_BMC, TYPE_IPMI_BMC)struct IPMIBmc {DeviceState parent;
@@ -272,8 +266,8 @@ void ipmi_bmc_gen_event(IPMIBmc *b, uint8_t *evt, bool log);#define TYPE_IPMI_BMC_SIMULATOR "ipmi-bmc-sim"typedef struct IPMIBmcSim IPMIBmcSim ; -#define IPMI_BMC_SIMULATOR (obj) OBJECT_CHECK(IPMIBmcSim, (obj), \ - TYPE_IPMI_BMC_SIMULATOR) +DECLARE_INSTANCE_CHECKER (IPMIBmcSim,IPMI_BMC_SIMULATOR , + TYPE_IPMI_BMC_SIMULATOR) typedef struct RspBuffer {
include/hw/isa/i8259_internal.h +2 -6
@@ -34,12 +34,8 @@ typedef struct PICCommonState PICCommonState;#define TYPE_PIC_COMMON "pic-common"typedef struct PICCommonClass PICCommonClass ; -#define PIC_COMMON (obj) \ - OBJECT_CHECK(PICCommonState, (obj), TYPE_PIC_COMMON) -#define PIC_COMMON_CLASS (klass) \ - OBJECT_CLASS_CHECK(PICCommonClass, (klass), TYPE_PIC_COMMON) -#define PIC_COMMON_GET_CLASS (obj) \ - OBJECT_GET_CLASS(PICCommonClass, (obj), TYPE_PIC_COMMON) +DECLARE_OBJ_CHECKERS (PICCommonState, PICCommonClass, + PIC_COMMON, TYPE_PIC_COMMON)struct PICCommonClass {ISADeviceClass parent_class;
include/hw/isa/isa.h +6 -11
@@ -12,15 +12,12 @@#define TYPE_ISA_DEVICE "isa-device"typedef struct ISADeviceClass ISADeviceClass ; -#define ISA_DEVICE (obj) \ - OBJECT_CHECK(ISADevice, (obj), TYPE_ISA_DEVICE) -#define ISA_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(ISADeviceClass, (klass), TYPE_ISA_DEVICE) -#define ISA_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ISADeviceClass, (obj), TYPE_ISA_DEVICE) +DECLARE_OBJ_CHECKERS (ISADevice, ISADeviceClass, + ISA_DEVICE, TYPE_ISA_DEVICE)#define TYPE_ISA_BUS "ISA" -#define ISA_BUS (obj) OBJECT_CHECK(ISABus, (obj), TYPE_ISA_BUS) +DECLARE_INSTANCE_CHECKER (ISABus,ISA_BUS , + TYPE_ISA_BUS)#define TYPE_APPLE_SMC "isa-applesmc"#define APPLESMC_MAX_DATA_LENGTH 32
@@ -39,10 +36,8 @@ static inline uint16_t applesmc_port(void)#define TYPE_ISADMA "isa-dma"typedef struct IsaDmaClass IsaDmaClass ; -#define ISADMA_CLASS (klass) \ - OBJECT_CLASS_CHECK(IsaDmaClass, (klass), TYPE_ISADMA) -#define ISADMA_GET_CLASS (obj) \ - OBJECT_GET_CLASS(IsaDmaClass, (obj), TYPE_ISADMA) +DECLARE_CLASS_CHECKERS (IsaDmaClass,ISADMA , + TYPE_ISADMA)#define ISADMA (obj) \ INTERFACE_CHECK(IsaDma, (obj), TYPE_ISADMA)
include/hw/isa/pc87312.h +2 -1
@@ -31,7 +31,8 @@#define TYPE_PC87312_SUPERIO "pc87312"typedef struct PC87312State PC87312State ; -#define PC87312 (obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312_SUPERIO) +DECLARE_INSTANCE_CHECKER (PC87312State,PC87312 , + TYPE_PC87312_SUPERIO)struct PC87312State {/*< private >*/
include/hw/isa/superio.h +2 -6
@@ -17,12 +17,8 @@#define TYPE_ISA_SUPERIO "isa-superio"typedef struct ISASuperIOClass ISASuperIOClass ;typedef struct ISASuperIODevice ISASuperIODevice ; -#define ISA_SUPERIO (obj) \ - OBJECT_CHECK(ISASuperIODevice, (obj), TYPE_ISA_SUPERIO) -#define ISA_SUPERIO_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ISASuperIOClass, (obj), TYPE_ISA_SUPERIO) -#define ISA_SUPERIO_CLASS (klass) \ - OBJECT_CLASS_CHECK(ISASuperIOClass, (klass), TYPE_ISA_SUPERIO) +DECLARE_OBJ_CHECKERS (ISASuperIODevice, ISASuperIOClass, + ISA_SUPERIO, TYPE_ISA_SUPERIO)#define SUPERIO_MAX_SERIAL_PORTS 4
include/hw/m68k/mcf_fec.h +2 -1
@@ -13,7 +13,8 @@#define TYPE_MCF_FEC_NET "mcf-fec"typedef struct mcf_fec_state mcf_fec_state ; -#define MCF_FEC_NET (obj) OBJECT_CHECK(mcf_fec_state, (obj), TYPE_MCF_FEC_NET) +DECLARE_INSTANCE_CHECKER (mcf_fec_state,MCF_FEC_NET , + TYPE_MCF_FEC_NET)#define FEC_NUM_IRQ 13
include/hw/mem/memory-device.h +2 -4
@@ -20,10 +20,8 @@#define TYPE_MEMORY_DEVICE "memory-device"typedef struct MemoryDeviceClass MemoryDeviceClass ; -#define MEMORY_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(MemoryDeviceClass, (klass), TYPE_MEMORY_DEVICE) -#define MEMORY_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(MemoryDeviceClass, (obj), TYPE_MEMORY_DEVICE) +DECLARE_CLASS_CHECKERS (MemoryDeviceClass,MEMORY_DEVICE , + TYPE_MEMORY_DEVICE)#define MEMORY_DEVICE (obj) \ INTERFACE_CHECK(MemoryDeviceState, (obj), TYPE_MEMORY_DEVICE)
include/hw/mem/nvdimm.h +2 -4
@@ -48,10 +48,8 @@#define TYPE_NVDIMM "nvdimm"typedef struct NVDIMMClass NVDIMMClass ;typedef struct NVDIMMDevice NVDIMMDevice ; -#define NVDIMM (obj) OBJECT_CHECK(NVDIMMDevice, (obj), TYPE_NVDIMM) -#define NVDIMM_CLASS (oc) OBJECT_CLASS_CHECK(NVDIMMClass, (oc), TYPE_NVDIMM) -#define NVDIMM_GET_CLASS (obj) OBJECT_GET_CLASS(NVDIMMClass, (obj), \ - TYPE_NVDIMM) +DECLARE_OBJ_CHECKERS (NVDIMMDevice, NVDIMMClass, + NVDIMM, TYPE_NVDIMM)#define NVDIMM_LABEL_SIZE_PROP "label-size"#define NVDIMM_UUID_PROP "uuid"
include/hw/mem/pc-dimm.h +2 -6
@@ -23,12 +23,8 @@#define TYPE_PC_DIMM "pc-dimm"typedef struct PCDIMMDevice PCDIMMDevice ;typedef struct PCDIMMDeviceClass PCDIMMDeviceClass ; -#define PC_DIMM (obj) \ - OBJECT_CHECK(PCDIMMDevice, (obj), TYPE_PC_DIMM) -#define PC_DIMM_CLASS (oc) \ - OBJECT_CLASS_CHECK(PCDIMMDeviceClass, (oc), TYPE_PC_DIMM) -#define PC_DIMM_GET_CLASS (obj) \ - OBJECT_GET_CLASS(PCDIMMDeviceClass, (obj), TYPE_PC_DIMM) +DECLARE_OBJ_CHECKERS (PCDIMMDevice, PCDIMMDeviceClass, + PC_DIMM, TYPE_PC_DIMM)#define PC_DIMM_ADDR_PROP "addr"#define PC_DIMM_SLOT_PROP "slot"
include/hw/mips/cps.h +2 -1
@@ -30,7 +30,8 @@#define TYPE_MIPS_CPS "mips-cps"typedef struct MIPSCPSState MIPSCPSState ; -#define MIPS_CPS (obj) OBJECT_CHECK(MIPSCPSState, (obj), TYPE_MIPS_CPS) +DECLARE_INSTANCE_CHECKER (MIPSCPSState,MIPS_CPS , + TYPE_MIPS_CPS)struct MIPSCPSState {SysBusDevice parent_obj;
include/hw/misc/a9scu.h +2 -1
@@ -28,6 +28,7 @@ struct A9SCUState {typedef struct A9SCUState A9SCUState ;#define TYPE_A9_SCU "a9-scu" -#define A9_SCU (obj) OBJECT_CHECK(A9SCUState, (obj), TYPE_A9_SCU) +DECLARE_INSTANCE_CHECKER (A9SCUState,A9_SCU , + TYPE_A9_SCU)#endif
include/hw/misc/allwinner-cpucfg.h +2 -2
@@ -30,8 +30,8 @@#define TYPE_AW_CPUCFG "allwinner-cpucfg"typedef struct AwCpuCfgState AwCpuCfgState ; -#define AW_CPUCFG (obj) \ - OBJECT_CHECK(AwCpuCfgState, (obj), TYPE_AW_CPUCFG) +DECLARE_INSTANCE_CHECKER (AwCpuCfgState,AW_CPUCFG , +TYPE_AW_CPUCFG )/** @} */
include/hw/misc/allwinner-h3-ccu.h +2 -2
@@ -43,8 +43,8 @@#define TYPE_AW_H3_CCU "allwinner-h3-ccu"typedef struct AwH3ClockCtlState AwH3ClockCtlState ; -#define AW_H3_CCU (obj) \ - OBJECT_CHECK(AwH3ClockCtlState, (obj), TYPE_AW_H3_CCU) +DECLARE_INSTANCE_CHECKER (AwH3ClockCtlState,AW_H3_CCU , +TYPE_AW_H3_CCU )/** @} */
include/hw/misc/allwinner-h3-dramc.h +2 -2
@@ -59,8 +59,8 @@#define TYPE_AW_H3_DRAMC "allwinner-h3-dramc"typedef struct AwH3DramCtlState AwH3DramCtlState ; -#define AW_H3_DRAMC (obj) \ - OBJECT_CHECK(AwH3DramCtlState, (obj), TYPE_AW_H3_DRAMC) +DECLARE_INSTANCE_CHECKER (AwH3DramCtlState,AW_H3_DRAMC , +TYPE_AW_H3_DRAMC )/** @} */
include/hw/misc/allwinner-h3-sysctrl.h +2 -2
@@ -44,8 +44,8 @@#define TYPE_AW_H3_SYSCTRL "allwinner-h3-sysctrl"typedef struct AwH3SysCtrlState AwH3SysCtrlState ; -#define AW_H3_SYSCTRL (obj) \ - OBJECT_CHECK(AwH3SysCtrlState, (obj), TYPE_AW_H3_SYSCTRL) +DECLARE_INSTANCE_CHECKER (AwH3SysCtrlState,AW_H3_SYSCTRL , +TYPE_AW_H3_SYSCTRL )/** @} */
include/hw/misc/allwinner-sid.h +2 -2
@@ -31,8 +31,8 @@#define TYPE_AW_SID "allwinner-sid"typedef struct AwSidState AwSidState ; -#define AW_SID (obj) \ - OBJECT_CHECK(AwSidState, (obj), TYPE_AW_SID) +DECLARE_INSTANCE_CHECKER (AwSidState,AW_SID , +TYPE_AW_SID )/** @} */
include/hw/misc/arm11scu.h +2 -1
@@ -16,7 +16,8 @@#define TYPE_ARM11_SCU "arm11-scu"typedef struct ARM11SCUState ARM11SCUState ; -#define ARM11_SCU (obj) OBJECT_CHECK(ARM11SCUState, (obj), TYPE_ARM11_SCU) +DECLARE_INSTANCE_CHECKER (ARM11SCUState,ARM11_SCU , + TYPE_ARM11_SCU)struct ARM11SCUState {/*< private >*/
include/hw/misc/armsse-cpuid.h +2 -1
@@ -27,7 +27,8 @@#define TYPE_ARMSSE_CPUID "armsse-cpuid"typedef struct ARMSSECPUID ARMSSECPUID ; -#define ARMSSE_CPUID (obj) OBJECT_CHECK(ARMSSECPUID, (obj), TYPE_ARMSSE_CPUID) +DECLARE_INSTANCE_CHECKER (ARMSSECPUID ,ARMSSE_CPUID , + TYPE_ARMSSE_CPUID)struct ARMSSECPUID {/*< private >*/
include/hw/misc/armsse-mhu.h +2 -1
@@ -28,7 +28,8 @@#define TYPE_ARMSSE_MHU "armsse-mhu"typedef struct ARMSSEMHU ARMSSEMHU ; -#define ARMSSE_MHU (obj) OBJECT_CHECK(ARMSSEMHU, (obj), TYPE_ARMSSE_MHU) +DECLARE_INSTANCE_CHECKER (ARMSSEMHU ,ARMSSE_MHU , + TYPE_ARMSSE_MHU)struct ARMSSEMHU {/*< private >*/
include/hw/misc/aspeed_scu.h +2 -5
@@ -17,7 +17,8 @@#define TYPE_ASPEED_SCU "aspeed.scu"typedef struct AspeedSCUClass AspeedSCUClass ;typedef struct AspeedSCUState AspeedSCUState ; -#define ASPEED_SCU (obj) OBJECT_CHECK(AspeedSCUState, (obj), TYPE_ASPEED_SCU) +DECLARE_OBJ_CHECKERS (AspeedSCUState, AspeedSCUClass, + ASPEED_SCU, TYPE_ASPEED_SCU)#define TYPE_ASPEED_2400_SCU TYPE_ASPEED_SCU "-ast2400"#define TYPE_ASPEED_2500_SCU TYPE_ASPEED_SCU "-ast2500"#define TYPE_ASPEED_2600_SCU TYPE_ASPEED_SCU "-ast2600"
@@ -50,10 +51,6 @@ struct AspeedSCUState {extern bool is_supported_silicon_rev (uint32_t silicon_rev); -#define ASPEED_SCU_CLASS (klass) \ - OBJECT_CLASS_CHECK(AspeedSCUClass, (klass), TYPE_ASPEED_SCU) -#define ASPEED_SCU_GET_CLASS (obj) \ - OBJECT_GET_CLASS(AspeedSCUClass, (obj), TYPE_ASPEED_SCU)struct AspeedSCUClass {SysBusDeviceClass parent_class;
include/hw/misc/aspeed_sdmc.h +2 -5
@@ -15,7 +15,8 @@#define TYPE_ASPEED_SDMC "aspeed.sdmc"typedef struct AspeedSDMCClass AspeedSDMCClass ;typedef struct AspeedSDMCState AspeedSDMCState ; -#define ASPEED_SDMC (obj) OBJECT_CHECK(AspeedSDMCState, (obj), TYPE_ASPEED_SDMC) +DECLARE_OBJ_CHECKERS (AspeedSDMCState, AspeedSDMCClass, + ASPEED_SDMC, TYPE_ASPEED_SDMC)#define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400"#define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500"#define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC "-ast2600"
@@ -34,10 +35,6 @@ struct AspeedSDMCState {uint64_t max_ram_size; }; -#define ASPEED_SDMC_CLASS (klass) \ - OBJECT_CLASS_CHECK(AspeedSDMCClass, (klass), TYPE_ASPEED_SDMC) -#define ASPEED_SDMC_GET_CLASS (obj) \ - OBJECT_GET_CLASS(AspeedSDMCClass, (obj), TYPE_ASPEED_SDMC)struct AspeedSDMCClass {SysBusDeviceClass parent_class;
include/hw/misc/aspeed_xdma.h +2 -1
@@ -14,7 +14,8 @@#define TYPE_ASPEED_XDMA "aspeed.xdma"typedef struct AspeedXDMAState AspeedXDMAState ; -#define ASPEED_XDMA (obj) OBJECT_CHECK(AspeedXDMAState, (obj), TYPE_ASPEED_XDMA) +DECLARE_INSTANCE_CHECKER (AspeedXDMAState,ASPEED_XDMA , + TYPE_ASPEED_XDMA)#define ASPEED_XDMA_NUM_REGS (ASPEED_XDMA_REG_SIZE / sizeof(uint32_t))#define ASPEED_XDMA_REG_SIZE 0x7C
include/hw/misc/auxbus.h +6 -4
@@ -36,7 +36,8 @@ typedef enum AUXReply AUXReply;#define TYPE_AUXTOI2C "aux-to-i2c-bridge"typedef struct AUXTOI2CState AUXTOI2CState ; -#define AUXTOI2C (obj) OBJECT_CHECK(AUXTOI2CState, (obj), TYPE_AUXTOI2C) +DECLARE_INSTANCE_CHECKER (AUXTOI2CState,AUXTOI2C , + TYPE_AUXTOI2C)enum AUXCommand {WRITE_I2C =0 ,
@@ -57,7 +58,8 @@ enum AUXReply { };#define TYPE_AUX_BUS "aux-bus" -#define AUX_BUS (obj) OBJECT_CHECK(AUXBus, (obj), TYPE_AUX_BUS) +DECLARE_INSTANCE_CHECKER (AUXBus,AUX_BUS , + TYPE_AUX_BUS)struct AUXBus {/* < private > */
@@ -76,8 +78,8 @@ struct AUXBus { };#define TYPE_AUX_SLAVE "aux-slave" -#define AUX_SLAVE (obj) \ - OBJECT_CHECK(AUXSlave, (obj), TYPE_AUX_SLAVE) +DECLARE_INSTANCE_CHECKER (AUXSlave,AUX_SLAVE , + TYPE_AUX_SLAVE)struct AUXSlave {/* < private > */
include/hw/misc/avr_power.h +2 -1
@@ -32,7 +32,8 @@#define TYPE_AVR_MASK "avr-power"typedef struct AVRMaskState AVRMaskState ; -#define AVR_MASK (obj) OBJECT_CHECK(AVRMaskState, (obj), TYPE_AVR_MASK) +DECLARE_INSTANCE_CHECKER (AVRMaskState,AVR_MASK , + TYPE_AVR_MASK)struct AVRMaskState {/* <private> */
include/hw/misc/bcm2835_mbox.h +2 -2
@@ -14,8 +14,8 @@#define TYPE_BCM2835_MBOX "bcm2835-mbox"typedef struct BCM2835MboxState BCM2835MboxState ; -#define BCM2835_MBOX (obj) \ - OBJECT_CHECK(BCM2835MboxState, (obj), TYPE_BCM2835_MBOX) +DECLARE_INSTANCE_CHECKER (BCM2835MboxState,BCM2835_MBOX , + TYPE_BCM2835_MBOX) typedef struct { uint32_t reg[MBOX_SIZE];
include/hw/misc/bcm2835_mphi.h +2 -2
@@ -39,7 +39,7 @@ struct BCM2835MphiState {#define TYPE_BCM2835_MPHI "bcm2835-mphi" -#define BCM2835_MPHI (obj) \ - OBJECT_CHECK(BCM2835MphiState, (obj), TYPE_BCM2835_MPHI) +DECLARE_INSTANCE_CHECKER (BCM2835MphiState,BCM2835_MPHI , + TYPE_BCM2835_MPHI)#endif
include/hw/misc/bcm2835_property.h +2 -2
@@ -15,8 +15,8 @@#define TYPE_BCM2835_PROPERTY "bcm2835-property"typedef struct BCM2835PropertyState BCM2835PropertyState ; -#define BCM2835_PROPERTY (obj) \ - OBJECT_CHECK(BCM2835PropertyState, (obj), TYPE_BCM2835_PROPERTY) +DECLARE_INSTANCE_CHECKER (BCM2835PropertyState,BCM2835_PROPERTY , + TYPE_BCM2835_PROPERTY)struct BCM2835PropertyState {/*< private >*/
include/hw/misc/bcm2835_rng.h +2 -2
@@ -15,8 +15,8 @@#define TYPE_BCM2835_RNG "bcm2835-rng"typedef struct BCM2835RngState BCM2835RngState ; -#define BCM2835_RNG (obj) \ - OBJECT_CHECK(BCM2835RngState, (obj), TYPE_BCM2835_RNG) +DECLARE_INSTANCE_CHECKER (BCM2835RngState,BCM2835_RNG , + TYPE_BCM2835_RNG)struct BCM2835RngState {SysBusDevice busdev;
include/hw/misc/bcm2835_thermal.h +2 -2
@@ -15,8 +15,8 @@#define TYPE_BCM2835_THERMAL "bcm2835-thermal"typedef struct Bcm2835ThermalState Bcm2835ThermalState ; -#define BCM2835_THERMAL (obj) \ - OBJECT_CHECK(Bcm2835ThermalState, (obj), TYPE_BCM2835_THERMAL) +DECLARE_INSTANCE_CHECKER (Bcm2835ThermalState,BCM2835_THERMAL , + TYPE_BCM2835_THERMAL)struct Bcm2835ThermalState {/*< private >*/
include/hw/misc/grlib_ahb_apb_pnp.h +4 -4
@@ -27,13 +27,13 @@#define TYPE_GRLIB_AHB_PNP "grlib,ahbpnp"typedef struct AHBPnp AHBPnp ; -#define GRLIB_AHB_PNP (obj) \ - OBJECT_CHECK(AHBPnp, (obj), TYPE_GRLIB_AHB_PNP) +DECLARE_INSTANCE_CHECKER (AHBPnp,GRLIB_AHB_PNP , + TYPE_GRLIB_AHB_PNP)#define TYPE_GRLIB_APB_PNP "grlib,apbpnp"typedef struct APBPnp APBPnp ; -#define GRLIB_APB_PNP (obj) \ - OBJECT_CHECK(APBPnp, (obj), TYPE_GRLIB_APB_PNP) +DECLARE_INSTANCE_CHECKER (APBPnp,GRLIB_APB_PNP , + TYPE_GRLIB_APB_PNP) void grlib_ahb_pnp_add_entry(AHBPnp *dev, uint32_t address, uint32_t mask, uint8_t vendor, uint16_t device, int slave,
include/hw/misc/imx25_ccm.h +2 -1
@@ -65,7 +65,8 @@#define TYPE_IMX25_CCM "imx25.ccm"typedef struct IMX25CCMState IMX25CCMState ; -#define IMX25_CCM (obj) OBJECT_CHECK(IMX25CCMState, (obj), TYPE_IMX25_CCM) +DECLARE_INSTANCE_CHECKER (IMX25CCMState,IMX25_CCM , + TYPE_IMX25_CCM)struct IMX25CCMState {/* <private> */
include/hw/misc/imx31_ccm.h +2 -1
@@ -74,7 +74,8 @@#define TYPE_IMX31_CCM "imx31.ccm"typedef struct IMX31CCMState IMX31CCMState ; -#define IMX31_CCM (obj) OBJECT_CHECK(IMX31CCMState, (obj), TYPE_IMX31_CCM) +DECLARE_INSTANCE_CHECKER (IMX31CCMState,IMX31_CCM , + TYPE_IMX31_CCM)struct IMX31CCMState {/* <private> */
include/hw/misc/imx6_ccm.h +2 -1
@@ -180,7 +180,8 @@#define TYPE_IMX6_CCM "imx6.ccm"typedef struct IMX6CCMState IMX6CCMState ; -#define IMX6_CCM (obj) OBJECT_CHECK(IMX6CCMState, (obj), TYPE_IMX6_CCM) +DECLARE_INSTANCE_CHECKER (IMX6CCMState,IMX6_CCM , + TYPE_IMX6_CCM)struct IMX6CCMState {/* <private> */
include/hw/misc/imx6_src.h +2 -1
@@ -59,7 +59,8 @@#define TYPE_IMX6_SRC "imx6.src"typedef struct IMX6SRCState IMX6SRCState ; -#define IMX6_SRC (obj) OBJECT_CHECK(IMX6SRCState, (obj), TYPE_IMX6_SRC) +DECLARE_INSTANCE_CHECKER (IMX6SRCState,IMX6_SRC , + TYPE_IMX6_SRC)struct IMX6SRCState {/* <private> */
include/hw/misc/imx6ul_ccm.h +2 -1
@@ -209,7 +209,8 @@#define TYPE_IMX6UL_CCM "imx6ul.ccm"typedef struct IMX6ULCCMState IMX6ULCCMState ; -#define IMX6UL_CCM (obj) OBJECT_CHECK(IMX6ULCCMState, (obj), TYPE_IMX6UL_CCM) +DECLARE_INSTANCE_CHECKER (IMX6ULCCMState,IMX6UL_CCM , + TYPE_IMX6UL_CCM)struct IMX6ULCCMState {/* <private> */
include/hw/misc/imx7_ccm.h +4 -2
@@ -106,7 +106,8 @@ enum IMX7PMURegisters {#define TYPE_IMX7_CCM "imx7.ccm"typedef struct IMX7CCMState IMX7CCMState ; -#define IMX7_CCM (obj) OBJECT_CHECK(IMX7CCMState, (obj), TYPE_IMX7_CCM) +DECLARE_INSTANCE_CHECKER (IMX7CCMState,IMX7_CCM , + TYPE_IMX7_CCM)struct IMX7CCMState {/* <private> */
@@ -121,7 +122,8 @@ struct IMX7CCMState {#define TYPE_IMX7_ANALOG "imx7.analog"typedef struct IMX7AnalogState IMX7AnalogState ; -#define IMX7_ANALOG (obj) OBJECT_CHECK(IMX7AnalogState, (obj), TYPE_IMX7_ANALOG) +DECLARE_INSTANCE_CHECKER (IMX7AnalogState,IMX7_ANALOG , + TYPE_IMX7_ANALOG)struct IMX7AnalogState {/* <private> */
include/hw/misc/imx7_gpr.h +2 -1
@@ -18,7 +18,8 @@#define TYPE_IMX7_GPR "imx7.gpr"typedef struct IMX7GPRState IMX7GPRState ; -#define IMX7_GPR (obj) OBJECT_CHECK(IMX7GPRState, (obj), TYPE_IMX7_GPR) +DECLARE_INSTANCE_CHECKER (IMX7GPRState,IMX7_GPR , + TYPE_IMX7_GPR)struct IMX7GPRState {/* <private> */
include/hw/misc/imx7_snvs.h +2 -1
@@ -25,7 +25,8 @@ enum IMX7SNVSRegisters {#define TYPE_IMX7_SNVS "imx7.snvs"typedef struct IMX7SNVSState IMX7SNVSState ; -#define IMX7_SNVS (obj) OBJECT_CHECK(IMX7SNVSState, (obj), TYPE_IMX7_SNVS) +DECLARE_INSTANCE_CHECKER (IMX7SNVSState,IMX7_SNVS , + TYPE_IMX7_SNVS)struct IMX7SNVSState {/* <private> */
include/hw/misc/imx_rngc.h +2 -1
@@ -15,7 +15,8 @@#define TYPE_IMX_RNGC "imx.rngc"typedef struct IMXRNGCState IMXRNGCState ; -#define IMX_RNGC (obj) OBJECT_CHECK(IMXRNGCState, (obj), TYPE_IMX_RNGC) +DECLARE_INSTANCE_CHECKER (IMXRNGCState,IMX_RNGC , + TYPE_IMX_RNGC)struct IMXRNGCState {/*< private >*/
include/hw/misc/iotkit-secctl.h +2 -1
@@ -60,7 +60,8 @@#define TYPE_IOTKIT_SECCTL "iotkit-secctl"typedef struct IoTKitSecCtl IoTKitSecCtl ; -#define IOTKIT_SECCTL (obj) OBJECT_CHECK(IoTKitSecCtl, (obj), TYPE_IOTKIT_SECCTL) +DECLARE_INSTANCE_CHECKER (IoTKitSecCtl,IOTKIT_SECCTL , + TYPE_IOTKIT_SECCTL)#define IOTS_APB_PPC0_NUM_PORTS 3#define IOTS_APB_PPC1_NUM_PORTS 1
include/hw/misc/iotkit-sysctl.h +2 -2
@@ -32,8 +32,8 @@#define TYPE_IOTKIT_SYSCTL "iotkit-sysctl"typedef struct IoTKitSysCtl IoTKitSysCtl ; -#define IOTKIT_SYSCTL (obj) OBJECT_CHECK(IoTKitSysCtl, (obj), \ - TYPE_IOTKIT_SYSCTL) +DECLARE_INSTANCE_CHECKER (IoTKitSysCtl,IOTKIT_SYSCTL , + TYPE_IOTKIT_SYSCTL)struct IoTKitSysCtl {/*< private >*/
include/hw/misc/iotkit-sysinfo.h +2 -2
@@ -27,8 +27,8 @@#define TYPE_IOTKIT_SYSINFO "iotkit-sysinfo"typedef struct IoTKitSysInfo IoTKitSysInfo ; -#define IOTKIT_SYSINFO (obj) OBJECT_CHECK(IoTKitSysInfo, (obj), \ - TYPE_IOTKIT_SYSINFO) +DECLARE_INSTANCE_CHECKER (IoTKitSysInfo,IOTKIT_SYSINFO , + TYPE_IOTKIT_SYSINFO)struct IoTKitSysInfo {/*< private >*/
include/hw/misc/mac_via.h +6 -5
@@ -33,8 +33,8 @@#define TYPE_MOS6522_Q800_VIA1 "mos6522-q800-via1"typedef struct MOS6522Q800VIA1State MOS6522Q800VIA1State ; -#define MOS6522_Q800_VIA1 (obj) OBJECT_CHECK(MOS6522Q800VIA1State, (obj), \ - TYPE_MOS6522_Q800_VIA1) +DECLARE_INSTANCE_CHECKER (MOS6522Q800VIA1State,MOS6522_Q800_VIA1 , + TYPE_MOS6522_Q800_VIA1)struct MOS6522Q800VIA1State {/*< private >*/
@@ -69,8 +69,8 @@ struct MOS6522Q800VIA1State {#define TYPE_MOS6522_Q800_VIA2 "mos6522-q800-via2"typedef struct MOS6522Q800VIA2State MOS6522Q800VIA2State ; -#define MOS6522_Q800_VIA2 (obj) OBJECT_CHECK(MOS6522Q800VIA2State, (obj), \ - TYPE_MOS6522_Q800_VIA2) +DECLARE_INSTANCE_CHECKER (MOS6522Q800VIA2State,MOS6522_Q800_VIA2 , + TYPE_MOS6522_Q800_VIA2)struct MOS6522Q800VIA2State {/*< private >*/
@@ -80,7 +80,8 @@ struct MOS6522Q800VIA2State {#define TYPE_MAC_VIA "mac_via"typedef struct MacVIAState MacVIAState ; -#define MAC_VIA (obj) OBJECT_CHECK(MacVIAState, (obj), TYPE_MAC_VIA) +DECLARE_INSTANCE_CHECKER (MacVIAState,MAC_VIA , + TYPE_MAC_VIA)struct MacVIAState {SysBusDevice busdev;
include/hw/misc/macio/cuda.h +4 -3
@@ -66,13 +66,14 @@ struct MOS6522CUDAState {typedef struct MOS6522CUDAState MOS6522CUDAState ;#define TYPE_MOS6522_CUDA "mos6522-cuda" -#define MOS6522_CUDA (obj) OBJECT_CHECK(MOS6522CUDAState, (obj), \ - TYPE_MOS6522_CUDA) +DECLARE_INSTANCE_CHECKER (MOS6522CUDAState,MOS6522_CUDA , +TYPE_MOS6522_CUDA ) /* Cuda */#define TYPE_CUDA "cuda"typedef struct CUDAState CUDAState ; -#define CUDA (obj) OBJECT_CHECK(CUDAState, (obj), TYPE_CUDA) +DECLARE_INSTANCE_CHECKER (CUDAState,CUDA , + TYPE_CUDA)struct CUDAState {/*< private >*/
include/hw/misc/macio/gpio.h +2 -1
@@ -32,7 +32,8 @@#define TYPE_MACIO_GPIO "macio-gpio"typedef struct MacIOGPIOState MacIOGPIOState ; -#define MACIO_GPIO (obj) OBJECT_CHECK(MacIOGPIOState, (obj), TYPE_MACIO_GPIO) +DECLARE_INSTANCE_CHECKER (MacIOGPIOState,MACIO_GPIO , + TYPE_MACIO_GPIO)struct MacIOGPIOState {/*< private >*/
include/hw/misc/macio/macio.h +10 -7
@@ -41,7 +41,8 @@/* MacIO virtual bus */ #define TYPE_MACIO_BUS "macio-bus"typedef struct MacIOBusState MacIOBusState ; -#define MACIO_BUS (obj) OBJECT_CHECK(MacIOBusState, (obj), TYPE_MACIO_BUS) +DECLARE_INSTANCE_CHECKER (MacIOBusState,MACIO_BUS , + TYPE_MACIO_BUS)struct MacIOBusState {/*< private >*/
@@ -51,7 +52,8 @@ struct MacIOBusState {/* MacIO IDE */ #define TYPE_MACIO_IDE "macio-ide"typedef struct MACIOIDEState MACIOIDEState ; -#define MACIO_IDE (obj) OBJECT_CHECK(MACIOIDEState, (obj), TYPE_MACIO_IDE) +DECLARE_INSTANCE_CHECKER (MACIOIDEState,MACIO_IDE , + TYPE_MACIO_IDE)struct MACIOIDEState {/*< private >*/
@@ -78,7 +80,8 @@ void macio_ide_register_dma(MACIOIDEState *ide);#define TYPE_MACIO "macio"typedef struct MacIOState MacIOState ; -#define MACIO (obj) OBJECT_CHECK(MacIOState, (obj), TYPE_MACIO) +DECLARE_INSTANCE_CHECKER (MacIOState,MACIO , + TYPE_MACIO)struct MacIOState {/*< private >*/
@@ -96,8 +99,8 @@ struct MacIOState {#define TYPE_OLDWORLD_MACIO "macio-oldworld"typedef struct OldWorldMacIOState OldWorldMacIOState ; -#define OLDWORLD_MACIO (obj) \ - OBJECT_CHECK(OldWorldMacIOState, (obj), TYPE_OLDWORLD_MACIO) +DECLARE_INSTANCE_CHECKER (OldWorldMacIOState,OLDWORLD_MACIO , + TYPE_OLDWORLD_MACIO)struct OldWorldMacIOState {/*< private >*/
@@ -112,8 +115,8 @@ struct OldWorldMacIOState {#define TYPE_NEWWORLD_MACIO "macio-newworld"typedef struct NewWorldMacIOState NewWorldMacIOState ; -#define NEWWORLD_MACIO (obj) \ - OBJECT_CHECK(NewWorldMacIOState, (obj), TYPE_NEWWORLD_MACIO) +DECLARE_INSTANCE_CHECKER (NewWorldMacIOState,NEWWORLD_MACIO , + TYPE_NEWWORLD_MACIO)struct NewWorldMacIOState {/*< private >*/
include/hw/misc/macio/pmu.h +4 -3
@@ -181,8 +181,8 @@ struct MOS6522PMUState {typedef struct MOS6522PMUState MOS6522PMUState ;#define TYPE_MOS6522_PMU "mos6522-pmu" -#define MOS6522_PMU (obj) OBJECT_CHECK(MOS6522PMUState, (obj), \ - TYPE_MOS6522_PMU) +DECLARE_INSTANCE_CHECKER (MOS6522PMUState,MOS6522_PMU , +TYPE_MOS6522_PMU )/** * PMUState: * @last_b: last value of B register
@@ -234,6 +234,7 @@ struct PMUState {typedef struct PMUState PMUState ;#define TYPE_VIA_PMU "via-pmu" -#define VIA_PMU (obj) OBJECT_CHECK(PMUState, (obj), TYPE_VIA_PMU) +DECLARE_INSTANCE_CHECKER (PMUState,VIA_PMU , + TYPE_VIA_PMU)#endif /* PMU_H */
include/hw/misc/max111x.h +2 -2
@@ -49,8 +49,8 @@ typedef struct MAX111xState MAX111xState;#define TYPE_MAX_111X "max111x" -#define MAX_111X (obj) \ - OBJECT_CHECK(MAX111xState, (obj), TYPE_MAX_111X) +DECLARE_INSTANCE_CHECKER (MAX111xState,MAX_111X , + TYPE_MAX_111X)#define TYPE_MAX_1110 "max1110"#define TYPE_MAX_1111 "max1111"
include/hw/misc/mips_cmgcr.h +2 -1
@@ -15,7 +15,8 @@#define TYPE_MIPS_GCR "mips-gcr"typedef struct MIPSGCRState MIPSGCRState ; -#define MIPS_GCR (obj) OBJECT_CHECK(MIPSGCRState, (obj), TYPE_MIPS_GCR) +DECLARE_INSTANCE_CHECKER (MIPSGCRState,MIPS_GCR , + TYPE_MIPS_GCR)#define GCR_BASE_ADDR 0x1fbf8000ULL#define GCR_ADDRSPACE_SZ 0x8000
include/hw/misc/mips_cpc.h +2 -1
@@ -36,7 +36,8 @@#define TYPE_MIPS_CPC "mips-cpc"typedef struct MIPSCPCState MIPSCPCState ; -#define MIPS_CPC (obj) OBJECT_CHECK(MIPSCPCState, (obj), TYPE_MIPS_CPC) +DECLARE_INSTANCE_CHECKER (MIPSCPCState,MIPS_CPC , + TYPE_MIPS_CPC)struct MIPSCPCState {SysBusDevice parent_obj;
include/hw/misc/mips_itu.h +2 -1
@@ -25,7 +25,8 @@#define TYPE_MIPS_ITU "mips-itu"typedef struct MIPSITUState MIPSITUState ; -#define MIPS_ITU (obj) OBJECT_CHECK(MIPSITUState, (obj), TYPE_MIPS_ITU) +DECLARE_INSTANCE_CHECKER (MIPSITUState,MIPS_ITU , + TYPE_MIPS_ITU)#define ITC_CELL_DEPTH_SHIFT 2#define ITC_CELL_DEPTH (1u << ITC_CELL_DEPTH_SHIFT)
include/hw/misc/mps2-fpgaio.h +2 -1
@@ -26,7 +26,8 @@#define TYPE_MPS2_FPGAIO "mps2-fpgaio"typedef struct MPS2FPGAIO MPS2FPGAIO ; -#define MPS2_FPGAIO (obj) OBJECT_CHECK(MPS2FPGAIO, (obj), TYPE_MPS2_FPGAIO) +DECLARE_INSTANCE_CHECKER (MPS2FPGAIO ,MPS2_FPGAIO , + TYPE_MPS2_FPGAIO)struct MPS2FPGAIO {/*< private >*/
include/hw/misc/mps2-scc.h +2 -1
@@ -17,7 +17,8 @@#define TYPE_MPS2_SCC "mps2-scc"typedef struct MPS2SCC MPS2SCC ; -#define MPS2_SCC (obj) OBJECT_CHECK(MPS2SCC, (obj), TYPE_MPS2_SCC) +DECLARE_INSTANCE_CHECKER (MPS2SCC ,MPS2_SCC , + TYPE_MPS2_SCC)#define NUM_OSCCLK 3
include/hw/misc/msf2-sysreg.h +2 -1
@@ -63,7 +63,8 @@ enum {#define TYPE_MSF2_SYSREG "msf2-sysreg"typedef struct MSF2SysregState MSF2SysregState ; -#define MSF2_SYSREG (obj) OBJECT_CHECK(MSF2SysregState, (obj), TYPE_MSF2_SYSREG) +DECLARE_INSTANCE_CHECKER (MSF2SysregState,MSF2_SYSREG , + TYPE_MSF2_SYSREG)struct MSF2SysregState {SysBusDevice parent_obj;
include/hw/misc/nrf51_rng.h +2 -1
@@ -39,7 +39,8 @@#include "qom/object.h" #define TYPE_NRF51_RNG "nrf51_soc.rng"typedef struct NRF51RNGState NRF51RNGState ; -#define NRF51_RNG (obj) OBJECT_CHECK(NRF51RNGState, (obj), TYPE_NRF51_RNG) +DECLARE_INSTANCE_CHECKER (NRF51RNGState,NRF51_RNG , + TYPE_NRF51_RNG)#define NRF51_RNG_SIZE 0x1000
include/hw/misc/pca9552.h +2 -1
@@ -15,7 +15,8 @@#define TYPE_PCA9552 "pca9552"#define TYPE_PCA955X "pca955x"typedef struct PCA955xState PCA955xState ; -#define PCA955X (obj) OBJECT_CHECK(PCA955xState, (obj), TYPE_PCA955X) +DECLARE_INSTANCE_CHECKER (PCA955xState,PCA955X , + TYPE_PCA955X)#define PCA955X_NR_REGS 10#define PCA955X_PIN_COUNT_MAX 16
include/hw/misc/stm32f2xx_syscfg.h +2 -2
@@ -38,8 +38,8 @@#define TYPE_STM32F2XX_SYSCFG "stm32f2xx-syscfg"typedef struct STM32F2XXSyscfgState STM32F2XXSyscfgState ; -#define STM32F2XX_SYSCFG (obj) \ - OBJECT_CHECK(STM32F2XXSyscfgState, (obj), TYPE_STM32F2XX_SYSCFG) +DECLARE_INSTANCE_CHECKER (STM32F2XXSyscfgState,STM32F2XX_SYSCFG , + TYPE_STM32F2XX_SYSCFG)struct STM32F2XXSyscfgState {/* <private> */
include/hw/misc/stm32f4xx_exti.h +2 -2
@@ -38,8 +38,8 @@#define TYPE_STM32F4XX_EXTI "stm32f4xx-exti"typedef struct STM32F4xxExtiState STM32F4xxExtiState ; -#define STM32F4XX_EXTI (obj) \ - OBJECT_CHECK(STM32F4xxExtiState, (obj), TYPE_STM32F4XX_EXTI) +DECLARE_INSTANCE_CHECKER (STM32F4xxExtiState,STM32F4XX_EXTI , + TYPE_STM32F4XX_EXTI)#define NUM_GPIO_EVENT_IN_LINES 16#define NUM_INTERRUPT_OUT_LINES 16
include/hw/misc/stm32f4xx_syscfg.h +2 -2
@@ -39,8 +39,8 @@#define TYPE_STM32F4XX_SYSCFG "stm32f4xx-syscfg"typedef struct STM32F4xxSyscfgState STM32F4xxSyscfgState ; -#define STM32F4XX_SYSCFG (obj) \ - OBJECT_CHECK(STM32F4xxSyscfgState, (obj), TYPE_STM32F4XX_SYSCFG) +DECLARE_INSTANCE_CHECKER (STM32F4xxSyscfgState,STM32F4XX_SYSCFG , + TYPE_STM32F4XX_SYSCFG)#define SYSCFG_NUM_EXTICR 4
include/hw/misc/tz-mpc.h +2 -1
@@ -36,7 +36,8 @@#define TYPE_TZ_MPC "tz-mpc"typedef struct TZMPC TZMPC ; -#define TZ_MPC (obj) OBJECT_CHECK(TZMPC, (obj), TYPE_TZ_MPC) +DECLARE_INSTANCE_CHECKER (TZMPC ,TZ_MPC , + TYPE_TZ_MPC)#define TZ_NUM_PORTS 16
include/hw/misc/tz-msc.h +2 -1
@@ -56,7 +56,8 @@#define TYPE_TZ_MSC "tz-msc"typedef struct TZMSC TZMSC ; -#define TZ_MSC (obj) OBJECT_CHECK(TZMSC, (obj), TYPE_TZ_MSC) +DECLARE_INSTANCE_CHECKER (TZMSC ,TZ_MSC , + TYPE_TZ_MSC)struct TZMSC {/*< private >*/
include/hw/misc/tz-ppc.h +2 -1
@@ -70,7 +70,8 @@#define TYPE_TZ_PPC "tz-ppc"typedef struct TZPPC TZPPC ; -#define TZ_PPC (obj) OBJECT_CHECK(TZPPC, (obj), TYPE_TZ_PPC) +DECLARE_INSTANCE_CHECKER (TZPPC ,TZ_PPC , + TYPE_TZ_PPC)#define TZ_NUM_PORTS 16
include/hw/misc/unimp.h +2 -2
@@ -16,8 +16,8 @@#define TYPE_UNIMPLEMENTED_DEVICE "unimplemented-device"typedef struct UnimplementedDeviceState UnimplementedDeviceState ; -#define UNIMPLEMENTED_DEVICE (obj) \ - OBJECT_CHECK(UnimplementedDeviceState, (obj), TYPE_UNIMPLEMENTED_DEVICE) +DECLARE_INSTANCE_CHECKER (UnimplementedDeviceState,UNIMPLEMENTED_DEVICE , + TYPE_UNIMPLEMENTED_DEVICE)struct UnimplementedDeviceState {SysBusDevice parent_obj;
include/hw/misc/vmcoreinfo.h +2 -1
@@ -18,7 +18,8 @@#define VMCOREINFO_DEVICE "vmcoreinfo"typedef struct VMCoreInfoState VMCoreInfoState ; -#define VMCOREINFO (obj) OBJECT_CHECK(VMCoreInfoState, (obj), VMCOREINFO_DEVICE) +DECLARE_INSTANCE_CHECKER (VMCoreInfoState,VMCOREINFO , + VMCOREINFO_DEVICE)typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo ;
include/hw/misc/zynq-xadc.h +2 -2
@@ -25,8 +25,8 @@#define TYPE_ZYNQ_XADC "xlnx,zynq-xadc"typedef struct ZynqXADCState ZynqXADCState ; -#define ZYNQ_XADC (obj) \ - OBJECT_CHECK(ZynqXADCState, (obj), TYPE_ZYNQ_XADC) +DECLARE_INSTANCE_CHECKER (ZynqXADCState,ZYNQ_XADC , + TYPE_ZYNQ_XADC)struct ZynqXADCState {/*< private >*/
include/hw/net/allwinner-sun8i-emac.h +2 -2
@@ -31,8 +31,8 @@#define TYPE_AW_SUN8I_EMAC "allwinner-sun8i-emac"typedef struct AwSun8iEmacState AwSun8iEmacState ; -#define AW_SUN8I_EMAC (obj) \ - OBJECT_CHECK(AwSun8iEmacState, (obj), TYPE_AW_SUN8I_EMAC) +DECLARE_INSTANCE_CHECKER (AwSun8iEmacState,AW_SUN8I_EMAC , +TYPE_AW_SUN8I_EMAC )/** @} */
include/hw/net/allwinner_emac.h +2 -1
@@ -32,7 +32,8 @@#define TYPE_AW_EMAC "allwinner-emac"typedef struct AwEmacState AwEmacState ; -#define AW_EMAC (obj) OBJECT_CHECK(AwEmacState, (obj), TYPE_AW_EMAC) +DECLARE_INSTANCE_CHECKER (AwEmacState,AW_EMAC , +TYPE_AW_EMAC )/* * Allwinner EMAC register list
include/hw/net/cadence_gem.h +2 -1
@@ -28,7 +28,8 @@#define TYPE_CADENCE_GEM "cadence_gem"typedef struct CadenceGEMState CadenceGEMState ; -#define CADENCE_GEM (obj) OBJECT_CHECK(CadenceGEMState, (obj), TYPE_CADENCE_GEM) +DECLARE_INSTANCE_CHECKER (CadenceGEMState,CADENCE_GEM , + TYPE_CADENCE_GEM)#include "net/net.h" #include "hw/sysbus.h"
include/hw/net/ftgmac100.h +4 -2
@@ -13,7 +13,8 @@#define TYPE_FTGMAC100 "ftgmac100"typedef struct FTGMAC100State FTGMAC100State ; -#define FTGMAC100 (obj) OBJECT_CHECK(FTGMAC100State, (obj), TYPE_FTGMAC100) +DECLARE_INSTANCE_CHECKER (FTGMAC100State,FTGMAC100 , + TYPE_FTGMAC100)#include "hw/sysbus.h" #include "net/net.h"
@@ -70,7 +71,8 @@ struct FTGMAC100State {#define TYPE_ASPEED_MII "aspeed-mmi"typedef struct AspeedMiiState AspeedMiiState ; -#define ASPEED_MII (obj) OBJECT_CHECK(AspeedMiiState, (obj), TYPE_ASPEED_MII) +DECLARE_INSTANCE_CHECKER (AspeedMiiState,ASPEED_MII , +TYPE_ASPEED_MII )/* * AST2600 MII controller
include/hw/net/imx_fec.h +2 -1
@@ -27,7 +27,8 @@#define TYPE_IMX_FEC "imx.fec"
Lines of this file are not shown. View the raw message.
include/hw/ppc/pnv.h +20 -24
44 lines not on this page · raw message
include/hw/ppc/spapr_drc.h +16 -51
67 lines not on this page · raw message
include/hw/watchdog/cmsdk-apb-watchdog.h +2 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.2
Part of the diff is not shown here. View the raw message.
PATCH v4 12/18 Use DECLARE_*CHECKER* macros (pass 2)
In reply to Eduardo Habkost$ ./scripts/codeconverter/converter.py -i \ --pattern=TypeCheckMacro $(git grep -l '' -- '*.[ch]')
---
Changes v3 -> v4: none
Changes series v2 -> v3: this is a new patch added in series v3
The script was re-run after rebase and after additional patches were added to this series.
This is being submitted as a separate patch to make review easier, but it can be squashed into the previous patch once it gets reviewed.
---
Cc: Peter Maydell <[email protected]>
Cc: Laurent Vivier <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Marcel Apfelbaum <[email protected]>
Cc: Peter Chubb <[email protected]>
Cc: Mark Cave-Ayland <[email protected]>
Cc: David Gibson <[email protected]>
Cc: "Cédric Le Goater" <[email protected]>
Cc: Cornelia Huck <[email protected]>
Cc: Halil Pasic <[email protected]>
Cc: Christian Borntraeger <[email protected]>
Cc: Thomas Huth <[email protected]>
Cc: Juan Quintela <[email protected]>
Cc: "Dr. David Alan Gilbert" <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- include/hw/block/swim.h | 3 ++- include/hw/display/macfb.h | 8 ++----- include/hw/i386/x86-iommu.h | 8 ++----- include/hw/misc/imx_ccm.h | 8 ++----- include/hw/misc/mos6522.h | 7 ++---- include/hw/ppc/xive.h | 36 ++++++++++++------------------ include/hw/rdma/rdma.h | 6 +---- include/hw/s390x/s390-virtio-ccw.h | 6 ++--- migration/migration.h | 8 ++----- target/arm/cpu-qom.h | 6 ++--- target/rx/cpu-qom.h | 8 ++----- hw/arm/integratorcp.c | 12 +++++----- hw/arm/versatilepb.c | 4 ++-- hw/sd/pl181.c | 3 ++- 14 files changed, 43 insertions(+), 80 deletions(-)
include/hw/block/swim.h +2 -1
@@ -71,7 +71,8 @@ struct SWIMCtrl {#define TYPE_SWIM "swim"typedef struct Swim Swim ; -#define SWIM (obj) OBJECT_CHECK(Swim, (obj), TYPE_SWIM) +DECLARE_INSTANCE_CHECKER (Swim,SWIM , + TYPE_SWIM)struct Swim {SysBusDevice parent_obj;
include/hw/display/macfb.h +2 -6
@@ -45,10 +45,8 @@ struct MacfbSysBusState {#define TYPE_NUBUS_MACFB "nubus-macfb"typedef struct MacfbNubusDeviceClass MacfbNubusDeviceClass ;typedef struct MacfbNubusState MacfbNubusState ; -#define NUBUS_MACFB_CLASS (class) \ - OBJECT_CLASS_CHECK(MacfbNubusDeviceClass, (class), TYPE_NUBUS_MACFB) -#define NUBUS_MACFB_GET_CLASS (obj) \ - OBJECT_GET_CLASS(MacfbNubusDeviceClass, (obj), TYPE_NUBUS_MACFB) +DECLARE_OBJ_CHECKERS (MacfbNubusState, MacfbNubusDeviceClass, + NUBUS_MACFB, TYPE_NUBUS_MACFB)struct MacfbNubusDeviceClass {DeviceClass parent_class;
@@ -56,8 +54,6 @@ struct MacfbNubusDeviceClass {DeviceRealize parent_realize; }; -#define NUBUS_MACFB (obj) \ - OBJECT_CHECK(MacfbNubusState, (obj), TYPE_NUBUS_MACFB)struct MacfbNubusState {NubusDevice busdev;
include/hw/i386/x86-iommu.h +2 -6
@@ -28,12 +28,8 @@#define TYPE_X86_IOMMU_DEVICE ("x86-iommu")typedef struct X86IOMMUClass X86IOMMUClass ;typedef struct X86IOMMUState X86IOMMUState ; -#define X86_IOMMU_DEVICE (obj) \ - OBJECT_CHECK(X86IOMMUState, (obj), TYPE_X86_IOMMU_DEVICE) -#define X86_IOMMU_DEVICE_CLASS (klass) \ - OBJECT_CLASS_CHECK(X86IOMMUClass, (klass), TYPE_X86_IOMMU_DEVICE) -#define X86_IOMMU_DEVICE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(X86IOMMUClass, obj, TYPE_X86_IOMMU_DEVICE) +DECLARE_OBJ_CHECKERS (X86IOMMUState, X86IOMMUClass, + X86_IOMMU_DEVICE, TYPE_X86_IOMMU_DEVICE)#define X86_IOMMU_SID_INVALID (0xffff)
include/hw/misc/imx_ccm.h +2 -6
@@ -30,12 +30,8 @@#define TYPE_IMX_CCM "imx.ccm"typedef struct IMXCCMClass IMXCCMClass ;typedef struct IMXCCMState IMXCCMState ; -#define IMX_CCM (obj) \ - OBJECT_CHECK(IMXCCMState, (obj), TYPE_IMX_CCM) -#define IMX_CCM_CLASS (klass) \ - OBJECT_CLASS_CHECK(IMXCCMClass, (klass), TYPE_IMX_CCM) -#define IMX_CCM_GET_CLASS (obj) \ - OBJECT_GET_CLASS(IMXCCMClass, (obj), TYPE_IMX_CCM) +DECLARE_OBJ_CHECKERS (IMXCCMState, IMXCCMClass, + IMX_CCM, TYPE_IMX_CCM)struct IMXCCMState {/* <private> */
include/hw/misc/mos6522.h +2 -5
@@ -126,7 +126,8 @@ typedef struct MOS6522State MOS6522State;#define TYPE_MOS6522 "mos6522"typedef struct MOS6522DeviceClass MOS6522DeviceClass ; -#define MOS6522 (obj) OBJECT_CHECK(MOS6522State, (obj), TYPE_MOS6522) +DECLARE_OBJ_CHECKERS (MOS6522State, MOS6522DeviceClass, + MOS6522, TYPE_MOS6522)struct MOS6522DeviceClass {DeviceClass parent_class;
@@ -143,10 +144,6 @@ struct MOS6522DeviceClass {uint64_t (*get_timer2_load_time)(MOS6522State *dev,MOS6522Timer *ti); }; -#define MOS6522_CLASS (cls) \ - OBJECT_CLASS_CHECK(MOS6522DeviceClass, (cls), TYPE_MOS6522) -#define MOS6522_GET_CLASS (obj) \ - OBJECT_GET_CLASS(MOS6522DeviceClass, (obj), TYPE_MOS6522)extern const VMStateDescription vmstate_mos6522;
include/hw/ppc/xive.h +14 -22
@@ -155,10 +155,8 @@ typedef struct XiveNotifier XiveNotifier;#define XIVE_NOTIFIER (obj) \ INTERFACE_CHECK(XiveNotifier, (obj), TYPE_XIVE_NOTIFIER)typedef struct XiveNotifierClass XiveNotifierClass ; -#define XIVE_NOTIFIER_CLASS (klass) \ - OBJECT_CLASS_CHECK(XiveNotifierClass, (klass), TYPE_XIVE_NOTIFIER) -#define XIVE_NOTIFIER_GET_CLASS (obj) \ - OBJECT_GET_CLASS(XiveNotifierClass, (obj), TYPE_XIVE_NOTIFIER) +DECLARE_CLASS_CHECKERS (XiveNotifierClass,XIVE_NOTIFIER , + TYPE_XIVE_NOTIFIER)struct XiveNotifierClass {InterfaceClass parent;
@@ -171,7 +169,8 @@ struct XiveNotifierClass {#define TYPE_XIVE_SOURCE "xive-source"typedef struct XiveSource XiveSource ; -#define XIVE_SOURCE (obj) OBJECT_CHECK(XiveSource, (obj), TYPE_XIVE_SOURCE) +DECLARE_INSTANCE_CHECKER (XiveSource,XIVE_SOURCE , +TYPE_XIVE_SOURCE )/* * XIVE Interrupt Source characteristics, which define how the ESB are
@@ -308,7 +307,8 @@ void xive_source_set_irq(void *opaque, int srcno, int val);#define TYPE_XIVE_TCTX "xive-tctx"typedef struct XiveTCTX XiveTCTX ; -#define XIVE_TCTX (obj) OBJECT_CHECK(XiveTCTX, (obj), TYPE_XIVE_TCTX) +DECLARE_INSTANCE_CHECKER (XiveTCTX,XIVE_TCTX , +TYPE_XIVE_TCTX )/* * XIVE Thread interrupt Management register rings :
@@ -349,12 +349,8 @@ typedef struct XiveRouter XiveRouter;#define TYPE_XIVE_ROUTER "xive-router"typedef struct XiveRouterClass XiveRouterClass ; -#define XIVE_ROUTER (obj) \ - OBJECT_CHECK(XiveRouter, (obj), TYPE_XIVE_ROUTER) -#define XIVE_ROUTER_CLASS (klass) \ - OBJECT_CLASS_CHECK(XiveRouterClass, (klass), TYPE_XIVE_ROUTER) -#define XIVE_ROUTER_GET_CLASS (obj) \ - OBJECT_GET_CLASS(XiveRouterClass, (obj), TYPE_XIVE_ROUTER) +DECLARE_OBJ_CHECKERS (XiveRouter, XiveRouterClass, + XIVE_ROUTER, TYPE_XIVE_ROUTER)struct XiveRouterClass {SysBusDeviceClass parent;
@@ -398,10 +394,8 @@ typedef struct XiveTCTXMatch {#define XIVE_PRESENTER (obj) \ INTERFACE_CHECK(XivePresenter, (obj), TYPE_XIVE_PRESENTER)typedef struct XivePresenterClass XivePresenterClass ; -#define XIVE_PRESENTER_CLASS (klass) \ - OBJECT_CLASS_CHECK(XivePresenterClass, (klass), TYPE_XIVE_PRESENTER) -#define XIVE_PRESENTER_GET_CLASS (obj) \ - OBJECT_GET_CLASS(XivePresenterClass, (obj), TYPE_XIVE_PRESENTER) +DECLARE_CLASS_CHECKERS (XivePresenterClass,XIVE_PRESENTER , + TYPE_XIVE_PRESENTER)struct XivePresenterClass {InterfaceClass parent;
@@ -425,10 +419,8 @@ int xive_presenter_tctx_match(XivePresenter *xptr, XiveTCTX *tctx,#define XIVE_FABRIC (obj) \ INTERFACE_CHECK(XiveFabric, (obj), TYPE_XIVE_FABRIC)typedef struct XiveFabricClass XiveFabricClass ; -#define XIVE_FABRIC_CLASS (klass) \ - OBJECT_CLASS_CHECK(XiveFabricClass, (klass), TYPE_XIVE_FABRIC) -#define XIVE_FABRIC_GET_CLASS (obj) \ - OBJECT_GET_CLASS(XiveFabricClass, (obj), TYPE_XIVE_FABRIC) +DECLARE_CLASS_CHECKERS (XiveFabricClass,XIVE_FABRIC , + TYPE_XIVE_FABRIC)struct XiveFabricClass {InterfaceClass parent;
@@ -444,8 +436,8 @@ struct XiveFabricClass {#define TYPE_XIVE_END_SOURCE "xive-end-source"typedef struct XiveENDSource XiveENDSource ; -#define XIVE_END_SOURCE (obj) \ - OBJECT_CHECK(XiveENDSource, (obj), TYPE_XIVE_END_SOURCE) +DECLARE_INSTANCE_CHECKER (XiveENDSource,XIVE_END_SOURCE , + TYPE_XIVE_END_SOURCE)struct XiveENDSource {DeviceState parent;
include/hw/rdma/rdma.h +1 -5
@@ -20,12 +20,8 @@#define INTERFACE_RDMA_PROVIDER "rdma"typedef struct RdmaProviderClass RdmaProviderClass ; -#define RDMA_PROVIDER_CLASS (klass) \ - OBJECT_CLASS_CHECK(RdmaProviderClass, (klass), \ +DECLARE_CLASS_CHECKERS (RdmaProviderClass,RDMA_PROVIDER , INTERFACE_RDMA_PROVIDER) -#define RDMA_PROVIDER_GET_CLASS (obj) \ - OBJECT_GET_CLASS(RdmaProviderClass, (obj), \ - INTERFACE_RDMA_PROVIDER)#define RDMA_PROVIDER (obj) \ INTERFACE_CHECK(RdmaProvider, (obj), \ INTERFACE_RDMA_PROVIDER)
include/hw/s390x/s390-virtio-ccw.h +2 -4
@@ -18,11 +18,9 @@typedef struct S390CcwMachineClass S390CcwMachineClass ;typedef struct S390CcwMachineState S390CcwMachineState ; -#define S390_CCW_MACHINE (obj) \ - OBJECT_CHECK(S390CcwMachineState, (obj), TYPE_S390_CCW_MACHINE) +DECLARE_OBJ_CHECKERS (S390CcwMachineState, S390CcwMachineClass, + S390_CCW_MACHINE, TYPE_S390_CCW_MACHINE) -#define S390_CCW_MACHINE_CLASS (klass) \ - OBJECT_CLASS_CHECK(S390CcwMachineClass, (klass), TYPE_S390_CCW_MACHINE)struct S390CcwMachineState {/*< private >*/
migration/migration.h +2 -6
@@ -116,12 +116,8 @@ void fill_destination_postcopy_migration_info(MigrationInfo *info);#define TYPE_MIGRATION "migration"typedef struct MigrationClass MigrationClass ; -#define MIGRATION_OBJ_CLASS (klass) \ - OBJECT_CLASS_CHECK(MigrationClass, (klass), TYPE_MIGRATION) -#define MIGRATION_OBJ (obj) \ - OBJECT_CHECK(MigrationState, (obj), TYPE_MIGRATION) -#define MIGRATION_OBJ_GET_CLASS (obj) \ - OBJECT_GET_CLASS(MigrationClass, (obj), TYPE_MIGRATION) +DECLARE_OBJ_CHECKERS (MigrationState, MigrationClass, + MIGRATION_OBJ, TYPE_MIGRATION)struct MigrationClass {/*< private >*/
target/arm/cpu-qom.h +2 -4
@@ -63,10 +63,8 @@ struct ARMCPUClass {#define TYPE_AARCH64_CPU "aarch64-cpu"typedef struct AArch64CPUClass AArch64CPUClass ; -#define AARCH64_CPU_CLASS (klass) \ - OBJECT_CLASS_CHECK(AArch64CPUClass, (klass), TYPE_AARCH64_CPU) -#define AARCH64_CPU_GET_CLASS (obj) \ - OBJECT_GET_CLASS(AArch64CPUClass, (obj), TYPE_AARCH64_CPU) +DECLARE_CLASS_CHECKERS (AArch64CPUClass,AARCH64_CPU , + TYPE_AARCH64_CPU)struct AArch64CPUClass {/*< private >*/
target/rx/cpu-qom.h +2 -6
@@ -28,12 +28,8 @@typedef struct RXCPU RXCPU ;typedef struct RXCPUClass RXCPUClass ; -#define RX_CPU_CLASS (klass) \ - OBJECT_CLASS_CHECK(RXCPUClass, (klass), TYPE_RX_CPU) -#define RX_CPU (obj) \ - OBJECT_CHECK(RXCPU, (obj), TYPE_RX_CPU) -#define RX_CPU_GET_CLASS (obj) \ - OBJECT_GET_CLASS(RXCPUClass, (obj), TYPE_RX_CPU) +DECLARE_OBJ_CHECKERS (RXCPU , RXCPUClass, +RX_CPU ,TYPE_RX_CPU )/* * RXCPUClass:
hw/arm/integratorcp.c +6 -6
@@ -30,8 +30,8 @@#define TYPE_INTEGRATOR_CM "integrator_core"typedef struct IntegratorCMState IntegratorCMState ; -#define INTEGRATOR_CM (obj) \ - OBJECT_CHECK(IntegratorCMState, (obj), TYPE_INTEGRATOR_CM) +DECLARE_INSTANCE_CHECKER (IntegratorCMState,INTEGRATOR_CM , + TYPE_INTEGRATOR_CM)struct IntegratorCMState {/*< private >*/
@@ -329,8 +329,8 @@ static void integratorcm_realize(DeviceState *d, Error **errp)#define TYPE_INTEGRATOR_PIC "integrator_pic"typedef struct icp_pic_state icp_pic_state ; -#define INTEGRATOR_PIC (obj) \ - OBJECT_CHECK(icp_pic_state, (obj), TYPE_INTEGRATOR_PIC) +DECLARE_INSTANCE_CHECKER (icp_pic_state,INTEGRATOR_PIC , + TYPE_INTEGRATOR_PIC)struct icp_pic_state {/*< private >*/
@@ -469,8 +469,8 @@ static void icp_pic_init(Object *obj)#define TYPE_ICP_CONTROL_REGS "icp-ctrl-regs"typedef struct ICPCtrlRegsState ICPCtrlRegsState ; -#define ICP_CONTROL_REGS (obj) \ - OBJECT_CHECK(ICPCtrlRegsState, (obj), TYPE_ICP_CONTROL_REGS) +DECLARE_INSTANCE_CHECKER (ICPCtrlRegsState,ICP_CONTROL_REGS , + TYPE_ICP_CONTROL_REGS)struct ICPCtrlRegsState {/*< private >*/
hw/arm/versatilepb.c +2 -2
@@ -36,8 +36,8 @@#define TYPE_VERSATILE_PB_SIC "versatilepb_sic"typedef struct vpb_sic_state vpb_sic_state ; -#define VERSATILE_PB_SIC (obj) \ - OBJECT_CHECK(vpb_sic_state, (obj), TYPE_VERSATILE_PB_SIC) +DECLARE_INSTANCE_CHECKER (vpb_sic_state,VERSATILE_PB_SIC , + TYPE_VERSATILE_PB_SIC)struct vpb_sic_state {SysBusDevice parent_obj;
hw/sd/pl181.c +2 -1
@@ -24,7 +24,8 @@#define TYPE_PL181 "pl181"typedef struct PL181State PL181State ; -#define PL181 (obj) OBJECT_CHECK(PL181State, (obj), TYPE_PL181) +DECLARE_INSTANCE_CHECKER (PL181State,PL181 , + TYPE_PL181)#define TYPE_PL181_BUS "pl181-bus"
Signature · 1 line
2.26.2
PATCH v4 13/18 Use DECLARE_*CHECKER* macros (pass 3)
In reply to Eduardo Habkost$ ./scripts/codeconverter/converter.py -i \ --pattern=TypeCheckMacro $(git grep -l '' -- '*.[ch]')
---
Changes series v3 -> v4: this is a new patch added in series v4
The script was re-run after series rebase.
This is being submitted as a separate patch to make review easier, but it can be squashed into the previous patch once it gets reviewed.
---
Cc: Richard Henderson <[email protected]>
Cc: Helge Deller <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: Palmer Dabbelt <[email protected]>
Cc: Alistair Francis <[email protected]>
Cc: Sagar Karandikar <[email protected]>
Cc: Bastian Koppelmann <[email protected]>
Cc: Raphael Norwitz <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- include/hw/arm/armsse.h | 7 ++----- include/hw/riscv/spike.h | 4 ++-- include/hw/virtio/vhost-user-blk.h | 4 ++-- hw/hppa/lasi.c | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-)
include/hw/arm/armsse.h +2 -5
@@ -110,7 +110,8 @@#define TYPE_ARM_SSE "arm-sse"typedef struct ARMSSE ARMSSE ;typedef struct ARMSSEClass ARMSSEClass ; -#define ARM_SSE (obj) OBJECT_CHECK(ARMSSE, (obj), TYPE_ARM_SSE) +DECLARE_OBJ_CHECKERS (ARMSSE , ARMSSEClass, +ARM_SSE ,TYPE_ARM_SSE )/* * These type names are for specific IoTKit subsystems; other than
@@ -227,9 +228,5 @@ struct ARMSSEClass { const ARMSSEInfo *info; }; -#define ARM_SSE_CLASS (klass) \ - OBJECT_CLASS_CHECK(ARMSSEClass, (klass), TYPE_ARM_SSE) -#define ARM_SSE_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ARMSSEClass, (obj), TYPE_ARM_SSE)#endif
include/hw/riscv/spike.h +2 -2
@@ -28,8 +28,8 @@#define TYPE_SPIKE_MACHINE MACHINE_TYPE_NAME("spike")typedef struct SpikeState SpikeState ; -#define SPIKE_MACHINE (obj) \ - OBJECT_CHECK(SpikeState, (obj), TYPE_SPIKE_MACHINE) +DECLARE_INSTANCE_CHECKER (SpikeState,SPIKE_MACHINE , + TYPE_SPIKE_MACHINE)struct SpikeState {/*< private >*/
include/hw/virtio/vhost-user-blk.h +2 -2
@@ -24,8 +24,8 @@#define TYPE_VHOST_USER_BLK "vhost-user-blk"typedef struct VHostUserBlk VHostUserBlk ; -#define VHOST_USER_BLK (obj) \ - OBJECT_CHECK(VHostUserBlk, (obj), TYPE_VHOST_USER_BLK) +DECLARE_INSTANCE_CHECKER (VHostUserBlk,VHOST_USER_BLK , + TYPE_VHOST_USER_BLK)#define VHOST_USER_BLK_AUTO_NUM_QUEUES UINT16_MAX
hw/hppa/lasi.c +2 -2
@@ -54,8 +54,8 @@#define ICR_TOC_BIT LASI_BIT(1)/* bit 1 in ICR */ typedef struct LasiState LasiState ; -#define LASI_CHIP (obj) \ - OBJECT_CHECK(LasiState, (obj), TYPE_LASI_CHIP) +DECLARE_INSTANCE_CHECKER (LasiState,LASI_CHIP , + TYPE_LASI_CHIP)struct LasiState {PCIHostState parent_obj;
Signature · 1 line
2.26.2
PATCH v4 14/18 Use DECLARE_*CHECKER* when possible (--force mode)
In reply to Eduardo HabkostSeparate run of the TypeCheckMacro converter using the --force flag, for the cases where typedefs weren't found in the same header nor in typedefs.h.
Generated initially using:
$ ./scripts/codeconverter/converter.py --force -i \ --pattern=TypeCheckMacro $(git grep -l '' -- '*.[ch]')
Then each case was manually reviewed, and a comment was added indicating what's unusual about those type checking macros/functions. Despite not following the usual pattern, the changes in this patch were found to be safe.
---
Changes v3 -> v4: none
Changes v2 -> v3: none
Changes v1 -> v2:
* Most of the old changes in this patch are now being handled by the regular TypeCheckMacro patch (without --force mode)
* Added comments added explaining why these unusual changes remain
---
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: Beniamino Galvani <[email protected]>
Cc: Andrew Baumann <[email protected]>
Cc: "Philippe Mathieu-Daudé" <[email protected]>
Cc: Andrzej Zaborowski <[email protected]>
Cc: David Gibson <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- include/hw/intc/arm_gic.h | 9 +++------ include/hw/intc/arm_gicv3.h | 8 +++----- include/hw/ppc/xics_spapr.h | 4 +++- include/hw/virtio/virtio-mmio.h | 9 +++------ hw/intc/apic.c | 5 +++-- hw/intc/arm_gic_kvm.c | 9 +++------ hw/intc/arm_gicv3_its_kvm.c | 8 +++----- hw/intc/arm_gicv3_kvm.c | 9 +++------ hw/sd/allwinner-sdhost.c | 5 +++-- hw/sd/bcm2835_sdhost.c | 5 +++-- hw/sd/pxa2xx_mmci.c | 4 +++- hw/sd/sdhci.c | 4 +++- 12 files changed, 36 insertions(+), 43 deletions(-)
include/hw/intc/arm_gic.h +3 -6
@@ -74,12 +74,9 @@#define TYPE_ARM_GIC "arm_gic"typedef struct ARMGICClass ARMGICClass ; -#define ARM_GIC (obj) \ - OBJECT_CHECK(GICState, (obj), TYPE_ARM_GIC) -#define ARM_GIC_CLASS (klass) \ - OBJECT_CLASS_CHECK(ARMGICClass, (klass), TYPE_ARM_GIC) -#define ARM_GIC_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ARMGICClass, (obj), TYPE_ARM_GIC) +/* This is reusing the GICState typedef from TYPE_ARM_GIC_COMMON */ +DECLARE_OBJ_CHECKERS (GICState, ARMGICClass, + ARM_GIC, TYPE_ARM_GIC)struct ARMGICClass {/*< private >*/
include/hw/intc/arm_gicv3.h +3 -5
@@ -17,11 +17,9 @@#define TYPE_ARM_GICV3 "arm-gicv3"typedef struct ARMGICv3Class ARMGICv3Class ; -#define ARM_GICV3 (obj) OBJECT_CHECK(GICv3State, (obj), TYPE_ARM_GICV3) -#define ARM_GICV3_CLASS (klass) \ - OBJECT_CLASS_CHECK(ARMGICv3Class, (klass), TYPE_ARM_GICV3) -#define ARM_GICV3_GET_CLASS (obj) \ - OBJECT_GET_CLASS(ARMGICv3Class, (obj), TYPE_ARM_GICV3) +/* This is reusing the GICState typedef from TYPE_ARM_GICV3_COMMON */ +DECLARE_OBJ_CHECKERS (GICv3State, ARMGICv3Class, + ARM_GICV3, TYPE_ARM_GICV3)struct ARMGICv3Class {/*< private >*/
include/hw/ppc/xics_spapr.h +3 -1
@@ -31,7 +31,9 @@#include "qom/object.h" #define TYPE_ICS_SPAPR "ics-spapr" -#define ICS_SPAPR (obj) OBJECT_CHECK(ICSState, (obj), TYPE_ICS_SPAPR) +/* This is reusing the ICSState typedef from TYPE_ICS */ +DECLARE_INSTANCE_CHECKER (ICSState,ICS_SPAPR , + TYPE_ICS_SPAPR)int xics_kvm_connect (SpaprInterruptController *intc,uint32_t nr_servers,Error **errp);
include/hw/virtio/virtio-mmio.h +3 -6
@@ -28,12 +28,9 @@/* QOM macros */ /* virtio-mmio-bus */ #define TYPE_VIRTIO_MMIO_BUS "virtio-mmio-bus" -#define VIRTIO_MMIO_BUS (obj) \ - OBJECT_CHECK(VirtioBusState, (obj), TYPE_VIRTIO_MMIO_BUS) -#define VIRTIO_MMIO_BUS_GET_CLASS (obj) \ - OBJECT_GET_CLASS(VirtioBusClass, (obj), TYPE_VIRTIO_MMIO_BUS) -#define VIRTIO_MMIO_BUS_CLASS (klass) \ - OBJECT_CLASS_CHECK(VirtioBusClass, (klass), TYPE_VIRTIO_MMIO_BUS) +/* This is reusing the VirtioBusState typedef from TYPE_VIRTIO_BUS */ +DECLARE_OBJ_CHECKERS (VirtioBusState, VirtioBusClass, +VIRTIO_MMIO_BUS ,TYPE_VIRTIO_MMIO_BUS ) /* virtio-mmio */#define TYPE_VIRTIO_MMIO "virtio-mmio"
hw/intc/apic.c +3 -2
@@ -40,8 +40,9 @@static APICCommonState *local_apics[MAX_APICS +1 ];#define TYPE_APIC "apic" -#define APIC (obj) \ - OBJECT_CHECK(APICCommonState, (obj), TYPE_APIC) +/*This is reusing the APICCommonState typedef from APIC_COMMON */ +DECLARE_INSTANCE_CHECKER (APICCommonState,APIC , + TYPE_APIC)static void apic_set_irq (APICCommonState *s,int vector_num,int trigger_mode);static void apic_update_irq (APICCommonState *s);
hw/intc/arm_gic_kvm.c +3 -6
@@ -33,12 +33,9 @@#define TYPE_KVM_ARM_GIC "kvm-arm-gic"typedef struct KVMARMGICClass KVMARMGICClass ; -#define KVM_ARM_GIC (obj) \ - OBJECT_CHECK(GICState, (obj), TYPE_KVM_ARM_GIC) -#define KVM_ARM_GIC_CLASS (klass) \ - OBJECT_CLASS_CHECK(KVMARMGICClass, (klass), TYPE_KVM_ARM_GIC) -#define KVM_ARM_GIC_GET_CLASS (obj) \ - OBJECT_GET_CLASS(KVMARMGICClass, (obj), TYPE_KVM_ARM_GIC) +/* This is reusing the GICState typedef from ARM_GIC_COMMON */ +DECLARE_OBJ_CHECKERS (GICState, KVMARMGICClass, + KVM_ARM_GIC, TYPE_KVM_ARM_GIC)struct KVMARMGICClass {ARMGICCommonClass parent_class;
hw/intc/arm_gicv3_its_kvm.c +3 -5
@@ -31,11 +31,9 @@#define TYPE_KVM_ARM_ITS "arm-its-kvm"typedef struct KVMARMITSClass KVMARMITSClass ; -#define KVM_ARM_ITS (obj) OBJECT_CHECK(GICv3ITSState, (obj), TYPE_KVM_ARM_ITS) -#define KVM_ARM_ITS_CLASS (klass) \ - OBJECT_CLASS_CHECK(KVMARMITSClass, (klass), TYPE_KVM_ARM_ITS) -#define KVM_ARM_ITS_GET_CLASS (obj) \ - OBJECT_GET_CLASS(KVMARMITSClass, (obj), TYPE_KVM_ARM_ITS) +/* This is reusing the GICv3ITSState typedef from ARM_GICV3_ITS_COMMON */ +DECLARE_OBJ_CHECKERS (GICv3ITSState, KVMARMITSClass, + KVM_ARM_ITS, TYPE_KVM_ARM_ITS)struct KVMARMITSClass {GICv3ITSCommonClass parent_class;
hw/intc/arm_gicv3_kvm.c +3 -6
@@ -43,12 +43,9 @@#define TYPE_KVM_ARM_GICV3 "kvm-arm-gicv3"typedef struct KVMARMGICv3Class KVMARMGICv3Class ; -#define KVM_ARM_GICV3 (obj) \ - OBJECT_CHECK(GICv3State, (obj), TYPE_KVM_ARM_GICV3) -#define KVM_ARM_GICV3_CLASS (klass) \ - OBJECT_CLASS_CHECK(KVMARMGICv3Class, (klass), TYPE_KVM_ARM_GICV3) -#define KVM_ARM_GICV3_GET_CLASS (obj) \ - OBJECT_GET_CLASS(KVMARMGICv3Class, (obj), TYPE_KVM_ARM_GICV3) +/* This is reusing the GICv3State typedef from ARM_GICV3_ITS_COMMON */ +DECLARE_OBJ_CHECKERS (GICv3State, KVMARMGICv3Class, + KVM_ARM_GICV3, TYPE_KVM_ARM_GICV3)#define KVM_DEV_ARM_VGIC_SYSREG (op0, op1, crn, crm, op2) \ (ARM64_SYS_REG_SHIFT_MASK(op0, OP0) | \
hw/sd/allwinner-sdhost.c +3 -2
@@ -32,8 +32,9 @@#include "qom/object.h" #define TYPE_AW_SDHOST_BUS "allwinner-sdhost-bus" -#define AW_SDHOST_BUS (obj) \ - OBJECT_CHECK(SDBus, (obj), TYPE_AW_SDHOST_BUS) +/* This is reusing the SDBus typedef from SD_BUS */ +DECLARE_INSTANCE_CHECKER(SDBus, AW_SDHOST_BUS, + TYPE_AW_SDHOST_BUS) /* SD Host register offsets */ enum {
hw/sd/bcm2835_sdhost.c +3 -2
@@ -22,8 +22,9 @@#include "qom/object.h" #define TYPE_BCM2835_SDHOST_BUS "bcm2835-sdhost-bus" -#define BCM2835_SDHOST_BUS (obj) \ - OBJECT_CHECK(SDBus, (obj), TYPE_BCM2835_SDHOST_BUS) +/* This is reusing the SDBus typedef from SD_BUS */ +DECLARE_INSTANCE_CHECKER (SDBus,BCM2835_SDHOST_BUS , + TYPE_BCM2835_SDHOST_BUS)#define SDCMD 0x00/* Command to SD card - 16 R/W */ #define SDARG 0x04/* Argument to SD card - 32 R/W */
hw/sd/pxa2xx_mmci.c +3 -1
@@ -24,7 +24,9 @@#include "qom/object.h" #define TYPE_PXA2XX_MMCI_BUS "pxa2xx-mmci-bus" -#define PXA2XX_MMCI_BUS (obj) OBJECT_CHECK(SDBus, (obj), TYPE_PXA2XX_MMCI_BUS) +/* This is reusing the SDBus typedef from SD_BUS */ +DECLARE_INSTANCE_CHECKER (SDBus,PXA2XX_MMCI_BUS , + TYPE_PXA2XX_MMCI_BUS)struct PXA2xxMMCIState {SysBusDevice parent_obj;
hw/sd/sdhci.c +3 -1
@@ -40,7 +40,9 @@#include "qom/object.h" #define TYPE_SDHCI_BUS "sdhci-bus" -#define SDHCI_BUS (obj) OBJECT_CHECK(SDBus, (obj), TYPE_SDHCI_BUS) +/* This is reusing the SDBus typedef from SD_BUS */ +DECLARE_INSTANCE_CHECKER (SDBus,SDHCI_BUS , + TYPE_SDHCI_BUS)#define MASKED_WRITE (reg, mask, val) (reg = (reg & (mask)) | (val))
Signature · 1 line
2.26.2
PATCH v4 15/18 Use OBJECT_DECLARE_TYPE where possible
In reply to Eduardo HabkostReplace DECLARE_OBJ_CHECKERS with OBJECT_DECLARE_TYPE where the typedefs can be safely removed.
Generated running:
$ ./scripts/codeconverter/converter.py -i \ --pattern=DeclareObjCheckers $(git grep -l '' -- '*.[ch]')
---
Changes v3 -> v4: none
Changes v2 -> v3:
* Removed hunks due to rebase conflict: include/hw/ppc/xive.h include/hw/arm/armsse.h
* Reviewed-by line from Daniel was kept, as no additional hunks are introduced in this version
Changes v1 -> v2:
* Script re-run after typedefs and macros were moved, and now the patch also touches:
- TYPE_ARM_SSE
- TYPE_SD_BUS
---
Cc: "Marc-André Lureau" <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: Peter Maydell <[email protected]>
Cc: Corey Minyard <[email protected]>
Cc: "Cédric Le Goater" <[email protected]>
Cc: David Gibson <[email protected]>
Cc: Cornelia Huck <[email protected]>
Cc: Thomas Huth <[email protected]>
Cc: Halil Pasic <[email protected]>
Cc: Christian Borntraeger <[email protected]>
Cc: "Philippe Mathieu-Daudé" <[email protected]>
Cc: Alistair Francis <[email protected]>
Cc: David Hildenbrand <[email protected]>
Cc: Laurent Vivier <[email protected]>
Cc: Amit Shah <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Anthony Perard <[email protected]>
Cc: Paul Durrant <[email protected]>
Cc: Paolo Bonzini <[email protected]>
Cc: Fam Zheng <[email protected]>
Cc: "Gonglei (Arei)" <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Cc: Igor Mammedov <[email protected]>
Cc: Stefan Berger <[email protected]>
Cc: Richard Henderson <[email protected]>
Cc: Michael Rolnik <[email protected]>
Cc: Sarah Harris <[email protected]>
Cc: "Edgar E. Iglesias" <[email protected]>
Cc: Michael Walle <[email protected]>
Cc: Aleksandar Markovic <[email protected]>
Cc: Aurelien Jarno <[email protected]>
Cc: Jiaxun Yang <[email protected]>
Cc: Aleksandar Rikalo <[email protected]>
Cc: Anthony Green <[email protected]>
Cc: Chris Wulff <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Stafford Horne <[email protected]>
Cc: Palmer Dabbelt <[email protected]>
Cc: Sagar Karandikar <[email protected]>
Cc: Bastian Koppelmann <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Cc: Mark Cave-Ayland <[email protected]>
Cc: Artyom Tarasenko <[email protected]>
Cc: Guan Xuetao <[email protected]>
Cc: Max Filippov <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- hw/audio/intel-hda.h | 6 ++---- hw/display/virtio-vga.h | 6 ++---- include/authz/base.h | 6 ++---- include/authz/list.h | 6 ++---- include/authz/listfile.h | 6 ++---- include/authz/pamacct.h | 6 ++---- include/authz/simple.h | 6 ++---- include/crypto/secret_common.h | 6 ++---- include/crypto/secret_keyring.h | 6 ++---- include/hw/hyperv/vmbus.h | 6 ++---- include/hw/i2c/i2c.h | 6 ++---- include/hw/i2c/smbus_slave.h | 6 ++---- include/hw/ipack/ipack.h | 6 ++---- include/hw/ipmi/ipmi.h | 6 ++---- include/hw/mem/pc-dimm.h | 6 ++---- include/hw/ppc/pnv.h | 6 ++---- include/hw/ppc/pnv_core.h | 6 ++---- include/hw/ppc/pnv_homer.h | 6 ++---- include/hw/ppc/pnv_occ.h | 6 ++---- include/hw/ppc/pnv_psi.h | 6 ++---- include/hw/ppc/pnv_xive.h | 6 ++---- include/hw/ppc/spapr_cpu_core.h | 6 ++---- include/hw/ppc/spapr_drc.h | 6 ++---- include/hw/ppc/spapr_vio.h | 6 ++---- include/hw/ppc/spapr_xive.h | 6 ++---- include/hw/ppc/xics.h | 6 ++---- include/hw/s390x/event-facility.h | 6 ++---- include/hw/s390x/s390_flic.h | 6 ++---- include/hw/s390x/sclp.h | 6 ++---- include/hw/sd/sd.h | 6 ++---- include/hw/ssi/ssi.h | 6 ++---- include/hw/sysbus.h | 6 ++---- include/hw/virtio/virtio-gpu.h | 6 ++---- include/hw/virtio/virtio-input.h | 6 ++---- include/hw/virtio/virtio-mem.h | 6 ++---- include/hw/virtio/virtio-pmem.h | 6 ++---- include/hw/virtio/virtio-serial.h | 6 ++---- include/hw/xen/xen-bus.h | 6 ++---- include/io/channel.h | 6 ++---- include/io/dns-resolver.h | 6 ++---- include/io/net-listener.h | 6 ++---- include/scsi/pr-manager.h | 6 ++---- include/sysemu/cryptodev.h | 6 ++---- include/sysemu/hostmem.h | 6 ++---- include/sysemu/rng.h | 6 ++---- include/sysemu/tpm_backend.h | 6 ++---- include/sysemu/vhost-user-backend.h | 6 ++---- target/alpha/cpu-qom.h | 6 ++---- target/arm/cpu-qom.h | 6 ++---- target/avr/cpu-qom.h | 6 ++---- target/cris/cpu-qom.h | 6 ++---- target/hppa/cpu-qom.h | 6 ++---- target/i386/cpu-qom.h | 6 ++---- target/lm32/cpu-qom.h | 6 ++---- target/m68k/cpu-qom.h | 6 ++---- target/microblaze/cpu-qom.h | 6 ++---- target/mips/cpu-qom.h | 6 ++---- target/moxie/cpu.h | 6 ++---- target/nios2/cpu.h | 6 ++---- target/openrisc/cpu.h | 6 ++---- target/ppc/cpu-qom.h | 6 ++---- target/riscv/cpu.h | 6 ++---- target/s390x/cpu-qom.h | 6 ++---- target/sh4/cpu-qom.h | 6 ++---- target/sparc/cpu-qom.h | 6 ++---- target/tilegx/cpu.h | 6 ++---- target/tricore/cpu-qom.h | 6 ++---- target/unicore32/cpu-qom.h | 6 ++---- target/xtensa/cpu-qom.h | 6 ++---- backends/dbus-vmstate.c | 6 ++---- ui/input-barrier.c | 6 ++---- ui/input-linux.c | 6 ++---- 72 files changed, 144 insertions(+), 288 deletions(-)
hw/audio/intel-hda.h +2 -4
@@ -8,10 +8,8 @@/* hda bus */ #define TYPE_HDA_CODEC_DEVICE "hda-codec" -typedef struct HDACodecDevice HDACodecDevice ; -typedef struct HDACodecDeviceClass HDACodecDeviceClass ; -DECLARE_OBJ_CHECKERS (HDACodecDevice, HDACodecDeviceClass, - HDA_CODEC_DEVICE, TYPE_HDA_CODEC_DEVICE) +OBJECT_DECLARE_TYPE (HDACodecDevice, HDACodecDeviceClass, + hda_codec_device, HDA_CODEC_DEVICE)#define TYPE_HDA_BUS "HDA"typedef struct HDACodecBus HDACodecBus ;
hw/display/virtio-vga.h +2 -4
@@ -9,10 +9,8 @@* virtio-vga-base: This extends VirtioPCIProxy. */ #define TYPE_VIRTIO_VGA_BASE "virtio-vga-base" -typedef struct VirtIOVGABase VirtIOVGABase ; -typedef struct VirtIOVGABaseClass VirtIOVGABaseClass ; -DECLARE_OBJ_CHECKERS (VirtIOVGABase, VirtIOVGABaseClass, - VIRTIO_VGA_BASE, TYPE_VIRTIO_VGA_BASE) +OBJECT_DECLARE_TYPE (VirtIOVGABase, VirtIOVGABaseClass, + virtio_vga_base, VIRTIO_VGA_BASE)struct VirtIOVGABase {VirtIOPCIProxy parent_obj;
include/authz/base.h +2 -4
@@ -27,10 +27,8 @@#define TYPE_QAUTHZ "authz" -typedef struct QAuthZ QAuthZ ; -typedef struct QAuthZClass QAuthZClass ; -DECLARE_OBJ_CHECKERS (QAuthZ, QAuthZClass, -QAUTHZ ,TYPE_QAUTHZ ) +OBJECT_DECLARE_TYPE (QAuthZ, QAuthZClass, + qauthz,QAUTHZ )/**
include/authz/list.h +2 -4
@@ -27,10 +27,8 @@#define TYPE_QAUTHZ_LIST "authz-list" -typedef struct QAuthZList QAuthZList ; -typedef struct QAuthZListClass QAuthZListClass ; -DECLARE_OBJ_CHECKERS (QAuthZList, QAuthZListClass, -QAUTHZ_LIST ,TYPE_QAUTHZ_LIST ) +OBJECT_DECLARE_TYPE (QAuthZList, QAuthZListClass, + qauthz_list,QAUTHZ_LIST )
include/authz/listfile.h +2 -4
@@ -27,10 +27,8 @@#define TYPE_QAUTHZ_LIST_FILE "authz-list-file" -typedef struct QAuthZListFile QAuthZListFile ; -typedef struct QAuthZListFileClass QAuthZListFileClass ; -DECLARE_OBJ_CHECKERS (QAuthZListFile, QAuthZListFileClass, -QAUTHZ_LIST_FILE ,TYPE_QAUTHZ_LIST_FILE ) +OBJECT_DECLARE_TYPE (QAuthZListFile, QAuthZListFileClass, + qauthz_list_file,QAUTHZ_LIST_FILE )
include/authz/pamacct.h +2 -4
@@ -27,10 +27,8 @@#define TYPE_QAUTHZ_PAM "authz-pam" -typedef struct QAuthZPAM QAuthZPAM ; -typedef struct QAuthZPAMClass QAuthZPAMClass ; -DECLARE_OBJ_CHECKERS (QAuthZPAM, QAuthZPAMClass, -QAUTHZ_PAM ,TYPE_QAUTHZ_PAM ) +OBJECT_DECLARE_TYPE (QAuthZPAM, QAuthZPAMClass, + qauthz_pam,QAUTHZ_PAM )
include/authz/simple.h +2 -4
@@ -26,10 +26,8 @@#define TYPE_QAUTHZ_SIMPLE "authz-simple" -typedef struct QAuthZSimple QAuthZSimple ; -typedef struct QAuthZSimpleClass QAuthZSimpleClass ; -DECLARE_OBJ_CHECKERS (QAuthZSimple, QAuthZSimpleClass, -QAUTHZ_SIMPLE ,TYPE_QAUTHZ_SIMPLE ) +OBJECT_DECLARE_TYPE (QAuthZSimple, QAuthZSimpleClass, + qauthz_simple,QAUTHZ_SIMPLE )
include/crypto/secret_common.h +2 -4
@@ -25,10 +25,8 @@#include "qom/object.h" #define TYPE_QCRYPTO_SECRET_COMMON "secret_common" -typedef struct QCryptoSecretCommon QCryptoSecretCommon ; -typedef struct QCryptoSecretCommonClass QCryptoSecretCommonClass ; -DECLARE_OBJ_CHECKERS (QCryptoSecretCommon, QCryptoSecretCommonClass, - QCRYPTO_SECRET_COMMON, TYPE_QCRYPTO_SECRET_COMMON) +OBJECT_DECLARE_TYPE (QCryptoSecretCommon, QCryptoSecretCommonClass, + qcrypto_secret_common, QCRYPTO_SECRET_COMMON)struct QCryptoSecretCommon {
include/crypto/secret_keyring.h +2 -4
@@ -26,10 +26,8 @@#include "crypto/secret_common.h" #define TYPE_QCRYPTO_SECRET_KEYRING "secret_keyring" -typedef struct QCryptoSecretKeyring QCryptoSecretKeyring ; -typedef struct QCryptoSecretKeyringClass QCryptoSecretKeyringClass ; -DECLARE_OBJ_CHECKERS (QCryptoSecretKeyring, QCryptoSecretKeyringClass, - QCRYPTO_SECRET_KEYRING, TYPE_QCRYPTO_SECRET_KEYRING) +OBJECT_DECLARE_TYPE (QCryptoSecretKeyring, QCryptoSecretKeyringClass, + qcrypto_secret_keyring, QCRYPTO_SECRET_KEYRING)struct QCryptoSecretKeyring {
include/hw/hyperv/vmbus.h +2 -4
@@ -20,10 +20,8 @@#define TYPE_VMBUS_DEVICE "vmbus-dev" -typedef struct VMBusDevice VMBusDevice ; -typedef struct VMBusDeviceClass VMBusDeviceClass ; -DECLARE_OBJ_CHECKERS (VMBusDevice, VMBusDeviceClass, - VMBUS_DEVICE, TYPE_VMBUS_DEVICE) +OBJECT_DECLARE_TYPE (VMBusDevice, VMBusDeviceClass, + vmbus_device, VMBUS_DEVICE)#define TYPE_VMBUS "vmbus"typedef struct VMBus VMBus ;
include/hw/i2c/i2c.h +2 -4
@@ -16,12 +16,10 @@ enum i2c_event {I2C_NACK /* Masker NACKed a receive byte. */ }; -typedef struct I2CSlave I2CSlave ;#define TYPE_I2C_SLAVE "i2c-slave" -typedef struct I2CSlaveClass I2CSlaveClass ; -DECLARE_OBJ_CHECKERS (I2CSlave, I2CSlaveClass, - I2C_SLAVE, TYPE_I2C_SLAVE) +OBJECT_DECLARE_TYPE (I2CSlave, I2CSlaveClass, + i2c_slave, I2C_SLAVE)struct I2CSlaveClass {DeviceClass parent_class;
include/hw/i2c/smbus_slave.h +2 -4
@@ -29,10 +29,8 @@#include "qom/object.h" #define TYPE_SMBUS_DEVICE "smbus-device" -typedef struct SMBusDevice SMBusDevice ; -typedef struct SMBusDeviceClass SMBusDeviceClass ; -DECLARE_OBJ_CHECKERS (SMBusDevice, SMBusDeviceClass, - SMBUS_DEVICE, TYPE_SMBUS_DEVICE) +OBJECT_DECLARE_TYPE (SMBusDevice, SMBusDeviceClass, + smbus_device, SMBUS_DEVICE)struct SMBusDeviceClass {
include/hw/ipack/ipack.h +2 -4
@@ -30,12 +30,10 @@ struct IPackBus {qemu_irq_handler set_irq; }; -typedef struct IPackDevice IPackDevice ; -typedef struct IPackDeviceClass IPackDeviceClass ;#define TYPE_IPACK_DEVICE "ipack-device" -DECLARE_OBJ_CHECKERS (IPackDevice, IPackDeviceClass, - IPACK_DEVICE, TYPE_IPACK_DEVICE) +OBJECT_DECLARE_TYPE (IPackDevice, IPackDeviceClass, + ipack_device, IPACK_DEVICE)struct IPackDeviceClass {/*< private >*/
include/hw/ipmi/ipmi.h +2 -4
@@ -175,10 +175,8 @@ struct IPMIInterfaceClass {* Define a BMC simulator (or perhaps a connection to a real BMC) */ #define TYPE_IPMI_BMC "ipmi-bmc" -typedef struct IPMIBmc IPMIBmc ; -typedef struct IPMIBmcClass IPMIBmcClass ; -DECLARE_OBJ_CHECKERS (IPMIBmc, IPMIBmcClass, - IPMI_BMC, TYPE_IPMI_BMC) +OBJECT_DECLARE_TYPE (IPMIBmc, IPMIBmcClass, + ipmi_bmc, IPMI_BMC)struct IPMIBmc {DeviceState parent;
include/hw/mem/pc-dimm.h +2 -4
@@ -21,10 +21,8 @@#include "qom/object.h" #define TYPE_PC_DIMM "pc-dimm" -typedef struct PCDIMMDevice PCDIMMDevice ; -typedef struct PCDIMMDeviceClass PCDIMMDeviceClass ; -DECLARE_OBJ_CHECKERS (PCDIMMDevice, PCDIMMDeviceClass, - PC_DIMM, TYPE_PC_DIMM) +OBJECT_DECLARE_TYPE (PCDIMMDevice, PCDIMMDeviceClass, + pc_dimm, PC_DIMM)#define PC_DIMM_ADDR_PROP "addr"#define PC_DIMM_SLOT_PROP "slot"
include/hw/ppc/pnv.h +2 -4
@@ -35,10 +35,8 @@#include "qom/object.h" #define TYPE_PNV_CHIP "pnv-chip" -typedef struct PnvChip PnvChip ; -typedef struct PnvChipClass PnvChipClass ; -DECLARE_OBJ_CHECKERS (PnvChip, PnvChipClass, - PNV_CHIP, TYPE_PNV_CHIP) +OBJECT_DECLARE_TYPE (PnvChip, PnvChipClass, + pnv_chip, PNV_CHIP)struct PnvChip {/*< private >*/
include/hw/ppc/pnv_core.h +2 -4
@@ -25,10 +25,8 @@#include "qom/object.h" #define TYPE_PNV_CORE "powernv-cpu-core" -typedef struct PnvCore PnvCore ; -typedef struct PnvCoreClass PnvCoreClass ; -DECLARE_OBJ_CHECKERS (PnvCore, PnvCoreClass, - PNV_CORE, TYPE_PNV_CORE) +OBJECT_DECLARE_TYPE (PnvCore, PnvCoreClass, + pnv_core, PNV_CORE)typedef struct PnvChip PnvChip ;
include/hw/ppc/pnv_homer.h +2 -4
@@ -24,10 +24,8 @@#include "qom/object.h" #define TYPE_PNV_HOMER "pnv-homer" -typedef struct PnvHomer PnvHomer ; -typedef struct PnvHomerClass PnvHomerClass ; -DECLARE_OBJ_CHECKERS (PnvHomer, PnvHomerClass, - PNV_HOMER, TYPE_PNV_HOMER) +OBJECT_DECLARE_TYPE (PnvHomer, PnvHomerClass, + pnv_homer, PNV_HOMER)#define TYPE_PNV8_HOMER TYPE_PNV_HOMER "-POWER8"DECLARE_INSTANCE_CHECKER (PnvHomer,PNV8_HOMER ,TYPE_PNV8_HOMER )
include/hw/ppc/pnv_occ.h +2 -4
@@ -24,10 +24,8 @@#include "qom/object.h" #define TYPE_PNV_OCC "pnv-occ" -typedef struct PnvOCC PnvOCC ; -typedef struct PnvOCCClass PnvOCCClass ; -DECLARE_OBJ_CHECKERS (PnvOCC, PnvOCCClass, - PNV_OCC, TYPE_PNV_OCC) +OBJECT_DECLARE_TYPE (PnvOCC, PnvOCCClass, + pnv_occ, PNV_OCC)#define TYPE_PNV8_OCC TYPE_PNV_OCC "-POWER8"DECLARE_INSTANCE_CHECKER (PnvOCC,PNV8_OCC ,TYPE_PNV8_OCC )
include/hw/ppc/pnv_psi.h +2 -4
@@ -26,10 +26,8 @@#include "qom/object.h" #define TYPE_PNV_PSI "pnv-psi" -typedef struct PnvPsi PnvPsi ; -typedef struct PnvPsiClass PnvPsiClass ; -DECLARE_OBJ_CHECKERS (PnvPsi, PnvPsiClass, - PNV_PSI, TYPE_PNV_PSI) +OBJECT_DECLARE_TYPE (PnvPsi, PnvPsiClass, + pnv_psi, PNV_PSI)#define PSIHB_XSCOM_MAX 0x20
include/hw/ppc/pnv_xive.h +2 -4
@@ -16,10 +16,8 @@struct PnvChip ;#define TYPE_PNV_XIVE "pnv-xive" -typedef struct PnvXive PnvXive ; -typedef struct PnvXiveClass PnvXiveClass ; -DECLARE_OBJ_CHECKERS (PnvXive, PnvXiveClass, - PNV_XIVE, TYPE_PNV_XIVE) +OBJECT_DECLARE_TYPE (PnvXive, PnvXiveClass, + pnv_xive, PNV_XIVE)#define XIVE_BLOCK_MAX 16
include/hw/ppc/spapr_cpu_core.h +2 -4
@@ -16,10 +16,8 @@#include "qom/object.h" #define TYPE_SPAPR_CPU_CORE "spapr-cpu-core" -typedef struct SpaprCpuCore SpaprCpuCore ; -typedef struct SpaprCpuCoreClass SpaprCpuCoreClass ; -DECLARE_OBJ_CHECKERS (SpaprCpuCore, SpaprCpuCoreClass, - SPAPR_CPU_CORE, TYPE_SPAPR_CPU_CORE) +OBJECT_DECLARE_TYPE (SpaprCpuCore, SpaprCpuCoreClass, + spapr_cpu_core, SPAPR_CPU_CORE)#define SPAPR_CPU_CORE_TYPE_NAME (model) model "-" TYPE_SPAPR_CPU_CORE
include/hw/ppc/spapr_drc.h +2 -4
@@ -20,10 +20,8 @@#include "qapi/error.h" #define TYPE_SPAPR_DR_CONNECTOR "spapr-dr-connector" -typedef struct SpaprDrc SpaprDrc ; -typedef struct SpaprDrcClass SpaprDrcClass ; -DECLARE_OBJ_CHECKERS (SpaprDrc, SpaprDrcClass, - SPAPR_DR_CONNECTOR, TYPE_SPAPR_DR_CONNECTOR) +OBJECT_DECLARE_TYPE (SpaprDrc, SpaprDrcClass, + spapr_dr_connector, SPAPR_DR_CONNECTOR)#define TYPE_SPAPR_DRC_PHYSICAL "spapr-drc-physical"typedef struct SpaprDrcPhysical SpaprDrcPhysical ;
include/hw/ppc/spapr_vio.h +2 -4
@@ -28,10 +28,8 @@#include "qom/object.h" #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device" -typedef struct SpaprVioDevice SpaprVioDevice ; -typedef struct SpaprVioDeviceClass SpaprVioDeviceClass ; -DECLARE_OBJ_CHECKERS (SpaprVioDevice, SpaprVioDeviceClass, - VIO_SPAPR_DEVICE, TYPE_VIO_SPAPR_DEVICE) +OBJECT_DECLARE_TYPE (SpaprVioDevice, SpaprVioDeviceClass, + vio_spapr_device, VIO_SPAPR_DEVICE)#define TYPE_SPAPR_VIO_BUS "spapr-vio-bus"typedef struct SpaprVioBus SpaprVioBus ;
include/hw/ppc/spapr_xive.h +2 -4
@@ -15,10 +15,8 @@#include "qom/object.h" #define TYPE_SPAPR_XIVE "spapr-xive" -typedef struct SpaprXive SpaprXive ; -typedef struct SpaprXiveClass SpaprXiveClass ; -DECLARE_OBJ_CHECKERS (SpaprXive, SpaprXiveClass, - SPAPR_XIVE, TYPE_SPAPR_XIVE) +OBJECT_DECLARE_TYPE (SpaprXive, SpaprXiveClass, + spapr_xive, SPAPR_XIVE)struct SpaprXive {XiveRouter parent;
include/hw/ppc/xics.h +2 -4
@@ -41,8 +41,6 @@* (the kernel implementation supports more but we don't exploit * that yet) */ -typedef struct ICPStateClass ICPStateClass ; -typedef struct ICPState ICPState ;typedef struct PnvICPState PnvICPState ;typedef struct ICSStateClass ICSStateClass ;typedef struct ICSState ICSState ;
@@ -50,8 +48,8 @@ typedef struct ICSIRQState ICSIRQState;typedef struct XICSFabric XICSFabric ;#define TYPE_ICP "icp" -DECLARE_OBJ_CHECKERS (ICPState, ICPStateClass, - ICP, TYPE_ICP) +OBJECT_DECLARE_TYPE (ICPState, ICPStateClass, + icp, ICP)#define TYPE_PNV_ICP "pnv-icp" DECLARE_INSTANCE_CHECKER(PnvICPState, PNV_ICP,
include/hw/s390x/event-facility.h +2 -4
@@ -42,10 +42,8 @@#define SCLP_SELECTIVE_READ 0x01#define TYPE_SCLP_EVENT "s390-sclp-event-type" -typedef struct SCLPEvent SCLPEvent ; -typedef struct SCLPEventClass SCLPEventClass ; -DECLARE_OBJ_CHECKERS (SCLPEvent, SCLPEventClass, - SCLP_EVENT, TYPE_SCLP_EVENT) +OBJECT_DECLARE_TYPE (SCLPEvent, SCLPEventClass, + sclp_event, SCLP_EVENT)#define TYPE_SCLP_CPU_HOTPLUG "sclp-cpu-hotplug"#define TYPE_SCLP_QUIESCE "sclpquiesce"
include/hw/s390x/s390_flic.h +2 -4
@@ -39,10 +39,8 @@ extern const VMStateDescription vmstate_adapter_routes; VMSTATE_STRUCT(_f, _s, 1, vmstate_adapter_routes, AdapterRoutes)#define TYPE_S390_FLIC_COMMON "s390-flic" -typedef struct S390FLICState S390FLICState ; -typedef struct S390FLICStateClass S390FLICStateClass ; -DECLARE_OBJ_CHECKERS (S390FLICState, S390FLICStateClass, - S390_FLIC_COMMON, TYPE_S390_FLIC_COMMON) +OBJECT_DECLARE_TYPE (S390FLICState, S390FLICStateClass, + s390_flic_common, S390_FLIC_COMMON)struct S390FLICState {SysBusDevice parent_obj;
include/hw/s390x/sclp.h +2 -4
@@ -182,10 +182,8 @@ typedef struct SCCB { }QEMU_PACKED SCCB ;#define TYPE_SCLP "sclp" -typedef struct SCLPDevice SCLPDevice ; -typedef struct SCLPDeviceClass SCLPDeviceClass ; -DECLARE_OBJ_CHECKERS (SCLPDevice, SCLPDeviceClass, - SCLP, TYPE_SCLP) +OBJECT_DECLARE_TYPE (SCLPDevice, SCLPDeviceClass, + sclp, SCLP)struct SCLPEventFacility ;
include/hw/sd/sd.h +2 -4
@@ -90,7 +90,6 @@ typedef struct { } SDRequest;typedef struct SDState SDState ; -typedef struct SDBus SDBus ;#define TYPE_SD_CARD "sd-card"typedef struct SDCardClass SDCardClass ;
@@ -130,9 +129,8 @@ struct SDCardClass { };#define TYPE_SD_BUS "sd-bus" -typedef struct SDBusClass SDBusClass ; -DECLARE_OBJ_CHECKERS (SDBus, SDBusClass, - SD_BUS, TYPE_SD_BUS) +OBJECT_DECLARE_TYPE (SDBus, SDBusClass, + sd_bus, SD_BUS)struct SDBus {BusState qbus;
include/hw/ssi/ssi.h +2 -4
@@ -14,13 +14,11 @@#include "hw/qdev-core.h" #include "qom/object.h" -typedef struct SSISlave SSISlave ; -typedef struct SSISlaveClass SSISlaveClass ;typedef enum SSICSMode SSICSMode ;#define TYPE_SSI_SLAVE "ssi-slave" -DECLARE_OBJ_CHECKERS (SSISlave, SSISlaveClass, - SSI_SLAVE, TYPE_SSI_SLAVE) +OBJECT_DECLARE_TYPE (SSISlave, SSISlaveClass, + ssi_slave, SSI_SLAVE)#define SSI_GPIO_CS "ssi-gpio-cs"
include/hw/sysbus.h +2 -4
@@ -14,12 +14,10 @@DECLARE_INSTANCE_CHECKER (BusState,SYSTEM_BUS , TYPE_SYSTEM_BUS) -typedef struct SysBusDevice SysBusDevice ;#define TYPE_SYS_BUS_DEVICE "sys-bus-device" -typedef struct SysBusDeviceClass SysBusDeviceClass ; -DECLARE_OBJ_CHECKERS (SysBusDevice, SysBusDeviceClass, -SYS_BUS_DEVICE ,TYPE_SYS_BUS_DEVICE ) +OBJECT_DECLARE_TYPE (SysBusDevice, SysBusDeviceClass, + sys_bus_device,SYS_BUS_DEVICE )/** * SysBusDeviceClass:
include/hw/virtio/virtio-gpu.h +2 -4
@@ -25,10 +25,8 @@#include "qom/object.h" #define TYPE_VIRTIO_GPU_BASE "virtio-gpu-base" -typedef struct VirtIOGPUBase VirtIOGPUBase ; -typedef struct VirtIOGPUBaseClass VirtIOGPUBaseClass ; -DECLARE_OBJ_CHECKERS (VirtIOGPUBase, VirtIOGPUBaseClass, - VIRTIO_GPU_BASE, TYPE_VIRTIO_GPU_BASE) +OBJECT_DECLARE_TYPE (VirtIOGPUBase, VirtIOGPUBaseClass, + virtio_gpu_base, VIRTIO_GPU_BASE)#define TYPE_VIRTIO_GPU "virtio-gpu-device"typedef struct VirtIOGPU VirtIOGPU ;
include/hw/virtio/virtio-input.h +2 -4
@@ -19,10 +19,8 @@ typedef struct virtio_input_event virtio_input_event;/* qemu internals */ #define TYPE_VIRTIO_INPUT "virtio-input-device" -typedef struct VirtIOInput VirtIOInput ; -typedef struct VirtIOInputClass VirtIOInputClass ; -DECLARE_OBJ_CHECKERS (VirtIOInput, VirtIOInputClass, - VIRTIO_INPUT, TYPE_VIRTIO_INPUT) +OBJECT_DECLARE_TYPE (VirtIOInput, VirtIOInputClass, + virtio_input, VIRTIO_INPUT)#define VIRTIO_INPUT_GET_PARENT_CLASS (obj) \ OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_INPUT)
include/hw/virtio/virtio-mem.h +2 -4
@@ -21,10 +21,8 @@#define TYPE_VIRTIO_MEM "virtio-mem" -typedef struct VirtIOMEM VirtIOMEM ; -typedef struct VirtIOMEMClass VirtIOMEMClass ; -DECLARE_OBJ_CHECKERS (VirtIOMEM, VirtIOMEMClass, - VIRTIO_MEM, TYPE_VIRTIO_MEM) +OBJECT_DECLARE_TYPE (VirtIOMEM, VirtIOMEMClass, + virtio_mem, VIRTIO_MEM)#define VIRTIO_MEM_MEMDEV_PROP "memdev"#define VIRTIO_MEM_NODE_PROP "node"
include/hw/virtio/virtio-pmem.h +2 -4
@@ -20,10 +20,8 @@#define TYPE_VIRTIO_PMEM "virtio-pmem" -typedef struct VirtIOPMEM VirtIOPMEM ; -typedef struct VirtIOPMEMClass VirtIOPMEMClass ; -DECLARE_OBJ_CHECKERS (VirtIOPMEM, VirtIOPMEMClass, - VIRTIO_PMEM, TYPE_VIRTIO_PMEM) +OBJECT_DECLARE_TYPE (VirtIOPMEM, VirtIOPMEMClass, + virtio_pmem, VIRTIO_PMEM)#define VIRTIO_PMEM_ADDR_PROP "memaddr"#define VIRTIO_PMEM_MEMDEV_PROP "memdev"
include/hw/virtio/virtio-serial.h +2 -4
@@ -26,10 +26,8 @@ struct virtio_serial_conf { };#define TYPE_VIRTIO_SERIAL_PORT "virtio-serial-port" -typedef struct VirtIOSerialPort VirtIOSerialPort ; -typedef struct VirtIOSerialPortClass VirtIOSerialPortClass ; -DECLARE_OBJ_CHECKERS (VirtIOSerialPort, VirtIOSerialPortClass, - VIRTIO_SERIAL_PORT, TYPE_VIRTIO_SERIAL_PORT) +OBJECT_DECLARE_TYPE (VirtIOSerialPort, VirtIOSerialPortClass, + virtio_serial_port, VIRTIO_SERIAL_PORT)typedef struct VirtIOSerial VirtIOSerial ;
include/hw/xen/xen-bus.h +2 -4
@@ -71,17 +71,15 @@ struct XenBus {XenWatch *backend_watch; QLIST_HEAD(, XenDevice) inactive_devices; }; -typedef struct XenBus XenBus ;struct XenBusClass {/*< private >*/ BusClass parent_class; }; -typedef struct XenBusClass XenBusClass ;#define TYPE_XEN_BUS "xen-bus" -DECLARE_OBJ_CHECKERS (XenBus, XenBusClass, - XEN_BUS, TYPE_XEN_BUS) +OBJECT_DECLARE_TYPE (XenBus, XenBusClass, + xen_bus, XEN_BUS)void xen_bus_init (void );
include/io/channel.h +2 -4
@@ -26,10 +26,8 @@#include "block/aio.h" #define TYPE_QIO_CHANNEL "qio-channel" -typedef struct QIOChannel QIOChannel ; -typedef struct QIOChannelClass QIOChannelClass ; -DECLARE_OBJ_CHECKERS (QIOChannel, QIOChannelClass, - QIO_CHANNEL, TYPE_QIO_CHANNEL) +OBJECT_DECLARE_TYPE (QIOChannel, QIOChannelClass, + qio_channel, QIO_CHANNEL)#define QIO_CHANNEL_ERR_BLOCK -2
include/io/dns-resolver.h +2 -4
@@ -26,10 +26,8 @@#include "io/task.h" #define TYPE_QIO_DNS_RESOLVER "qio-dns-resolver" -typedef struct QIODNSResolver QIODNSResolver ; -typedef struct QIODNSResolverClass QIODNSResolverClass ; -DECLARE_OBJ_CHECKERS (QIODNSResolver, QIODNSResolverClass, -QIO_DNS_RESOLVER ,TYPE_QIO_DNS_RESOLVER ) +OBJECT_DECLARE_TYPE (QIODNSResolver, QIODNSResolverClass, + qio_dns_resolver,QIO_DNS_RESOLVER )/**
include/io/net-listener.h +2 -4
@@ -25,10 +25,8 @@#include "qom/object.h" #define TYPE_QIO_NET_LISTENER "qio-net-listener" -typedef struct QIONetListener QIONetListener ; -typedef struct QIONetListenerClass QIONetListenerClass ; -DECLARE_OBJ_CHECKERS (QIONetListener, QIONetListenerClass, - QIO_NET_LISTENER, TYPE_QIO_NET_LISTENER) +OBJECT_DECLARE_TYPE (QIONetListener, QIONetListenerClass, + qio_net_listener, QIO_NET_LISTENER) typedef void (*QIONetListenerClientFunc)(QIONetListener *listener,
include/scsi/pr-manager.h +2 -4
@@ -9,10 +9,8 @@#define TYPE_PR_MANAGER "pr-manager" -typedef struct PRManager PRManager ; -typedef struct PRManagerClass PRManagerClass ; -DECLARE_OBJ_CHECKERS (PRManager, PRManagerClass, - PR_MANAGER, TYPE_PR_MANAGER) +OBJECT_DECLARE_TYPE (PRManager, PRManagerClass, + pr_manager, PR_MANAGER)struct sg_io_hdr ;
include/sysemu/cryptodev.h +2 -4
@@ -37,10 +37,8 @@#define TYPE_CRYPTODEV_BACKEND "cryptodev-backend" -typedef struct CryptoDevBackend CryptoDevBackend ; -typedef struct CryptoDevBackendClass CryptoDevBackendClass ; -DECLARE_OBJ_CHECKERS (CryptoDevBackend, CryptoDevBackendClass, - CRYPTODEV_BACKEND, TYPE_CRYPTODEV_BACKEND) +OBJECT_DECLARE_TYPE (CryptoDevBackend, CryptoDevBackendClass, + cryptodev_backend, CRYPTODEV_BACKEND)#define MAX_CRYPTO_QUEUE_NUM 64
include/sysemu/hostmem.h +2 -4
@@ -20,10 +20,8 @@#include "qemu/bitmap.h" #define TYPE_MEMORY_BACKEND "memory-backend" -typedef struct HostMemoryBackend HostMemoryBackend ; -typedef struct HostMemoryBackendClass HostMemoryBackendClass ; -DECLARE_OBJ_CHECKERS (HostMemoryBackend, HostMemoryBackendClass, -MEMORY_BACKEND ,TYPE_MEMORY_BACKEND ) +OBJECT_DECLARE_TYPE (HostMemoryBackend, HostMemoryBackendClass, + memory_backend,MEMORY_BACKEND )/* hostmem-ram.c */ /**
include/sysemu/rng.h +2 -4
@@ -17,10 +17,8 @@#include "qom/object.h" #define TYPE_RNG_BACKEND "rng-backend" -typedef struct RngBackend RngBackend ; -typedef struct RngBackendClass RngBackendClass ; -DECLARE_OBJ_CHECKERS (RngBackend, RngBackendClass, - RNG_BACKEND, TYPE_RNG_BACKEND) +OBJECT_DECLARE_TYPE (RngBackend, RngBackendClass, + rng_backend, RNG_BACKEND)#define TYPE_RNG_BUILTIN "rng-builtin"
include/sysemu/tpm_backend.h +2 -4
@@ -19,10 +19,8 @@#include "qapi/error.h" #define TYPE_TPM_BACKEND "tpm-backend" -typedef struct TPMBackend TPMBackend ; -typedef struct TPMBackendClass TPMBackendClass ; -DECLARE_OBJ_CHECKERS (TPMBackend, TPMBackendClass, - TPM_BACKEND, TYPE_TPM_BACKEND) +OBJECT_DECLARE_TYPE (TPMBackend, TPMBackendClass, + tpm_backend, TPM_BACKEND) typedef struct TPMBackendCmd {
include/sysemu/vhost-user-backend.h +2 -4
@@ -22,10 +22,8 @@#include "io/channel.h" #define TYPE_VHOST_USER_BACKEND "vhost-user-backend" -typedef struct VhostUserBackend VhostUserBackend ; -typedef struct VhostUserBackendClass VhostUserBackendClass ; -DECLARE_OBJ_CHECKERS (VhostUserBackend, VhostUserBackendClass, - VHOST_USER_BACKEND, TYPE_VHOST_USER_BACKEND) +OBJECT_DECLARE_TYPE (VhostUserBackend, VhostUserBackendClass, + vhost_user_backend, VHOST_USER_BACKEND)struct VhostUserBackendClass {
target/alpha/cpu-qom.h +2 -4
@@ -25,10 +25,8 @@#define TYPE_ALPHA_CPU "alpha-cpu" -typedef struct AlphaCPU AlphaCPU ; -typedef struct AlphaCPUClass AlphaCPUClass ; -DECLARE_OBJ_CHECKERS (AlphaCPU, AlphaCPUClass, -ALPHA_CPU ,TYPE_ALPHA_CPU ) +OBJECT_DECLARE_TYPE (AlphaCPU, AlphaCPUClass, + alpha_cpu,ALPHA_CPU )/** * AlphaCPUClass:
target/arm/cpu-qom.h +2 -4
@@ -27,10 +27,8 @@ struct arm_boot_info;#define TYPE_ARM_CPU "arm-cpu" -typedef struct ARMCPU ARMCPU ; -typedef struct ARMCPUClass ARMCPUClass ; -DECLARE_OBJ_CHECKERS (ARMCPU , ARMCPUClass, - ARM_CPU, TYPE_ARM_CPU) +OBJECT_DECLARE_TYPE (ARMCPU , ARMCPUClass, + arm_cpu, ARM_CPU)#define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU
target/avr/cpu-qom.h +2 -4
@@ -26,10 +26,8 @@#define TYPE_AVR_CPU "avr-cpu" -typedef struct AVRCPU AVRCPU ; -typedef struct AVRCPUClass AVRCPUClass ; -DECLARE_OBJ_CHECKERS (AVRCPU , AVRCPUClass, -AVR_CPU ,TYPE_AVR_CPU ) +OBJECT_DECLARE_TYPE (AVRCPU , AVRCPUClass, + avr_cpu,AVR_CPU )/** * AVRCPUClass:
target/cris/cpu-qom.h +2 -4
@@ -25,10 +25,8 @@#define TYPE_CRIS_CPU "cris-cpu" -typedef struct CRISCPU CRISCPU ; -typedef struct CRISCPUClass CRISCPUClass ; -DECLARE_OBJ_CHECKERS (CRISCPU , CRISCPUClass, -CRIS_CPU ,TYPE_CRIS_CPU ) +OBJECT_DECLARE_TYPE (CRISCPU , CRISCPUClass, + cris_cpu,CRIS_CPU )/** * CRISCPUClass:
target/hppa/cpu-qom.h +2 -4
@@ -25,10 +25,8 @@#define TYPE_HPPA_CPU "hppa-cpu" -typedef struct HPPACPU HPPACPU ; -typedef struct HPPACPUClass HPPACPUClass ; -DECLARE_OBJ_CHECKERS (HPPACPU , HPPACPUClass, -HPPA_CPU ,TYPE_HPPA_CPU ) +OBJECT_DECLARE_TYPE (HPPACPU , HPPACPUClass, + hppa_cpu,HPPA_CPU )/** * HPPACPUClass:
target/i386/cpu-qom.h +2 -4
@@ -30,10 +30,8 @@#define TYPE_X86_CPU "i386-cpu"#endif -typedef struct X86CPU X86CPU ; -typedef struct X86CPUClass X86CPUClass ; -DECLARE_OBJ_CHECKERS (X86CPU , X86CPUClass, - X86_CPU, TYPE_X86_CPU) +OBJECT_DECLARE_TYPE (X86CPU , X86CPUClass, + x86_cpu, X86_CPU)typedef struct X86CPUModel X86CPUModel ;
target/lm32/cpu-qom.h +2 -4
@@ -25,10 +25,8 @@#define TYPE_LM32_CPU "lm32-cpu" -typedef struct LM32CPU LM32CPU ; -typedef struct LM32CPUClass LM32CPUClass ; -DECLARE_OBJ_CHECKERS (LM32CPU , LM32CPUClass, -LM32_CPU ,TYPE_LM32_CPU ) +OBJECT_DECLARE_TYPE (LM32CPU , LM32CPUClass, + lm32_cpu,LM32_CPU )/** * LM32CPUClass:
target/m68k/cpu-qom.h +2 -4
@@ -25,10 +25,8 @@#define TYPE_M68K_CPU "m68k-cpu" -typedef struct M68kCPU M68kCPU ; -typedef struct M68kCPUClass M68kCPUClass ; -DECLARE_OBJ_CHECKERS (M68kCPU, M68kCPUClass, -M68K_CPU ,TYPE_M68K_CPU ) +OBJECT_DECLARE_TYPE (M68kCPU, M68kCPUClass, + m68k_cpu,M68K_CPU )/* * M68kCPUClass:
target/microblaze/cpu-qom.h +2 -4
@@ -25,10 +25,8 @@#define TYPE_MICROBLAZE_CPU "microblaze-cpu" -typedef struct MicroBlazeCPU MicroBlazeCPU ; -typedef struct MicroBlazeCPUClass MicroBlazeCPUClass ; -DECLARE_OBJ_CHECKERS (MicroBlazeCPU, MicroBlazeCPUClass, -MICROBLAZE_CPU ,TYPE_MICROBLAZE_CPU ) +OBJECT_DECLARE_TYPE (MicroBlazeCPU, MicroBlazeCPUClass, + microblaze_cpu,MICROBLAZE_CPU )/** * MicroBlazeCPUClass:
target/mips/cpu-qom.h +2 -4
@@ -29,10 +29,8 @@#define TYPE_MIPS_CPU "mips-cpu"#endif -typedef struct MIPSCPU MIPSCPU ; -typedef struct MIPSCPUClass MIPSCPUClass ; -DECLARE_OBJ_CHECKERS (MIPSCPU , MIPSCPUClass, -MIPS_CPU ,TYPE_MIPS_CPU ) +OBJECT_DECLARE_TYPE (MIPSCPU , MIPSCPUClass, + mips_cpu,MIPS_CPU )/** * MIPSCPUClass:
target/moxie/cpu.h +2 -4
@@ -51,10 +51,8 @@ typedef struct CPUMoxieState {#define TYPE_MOXIE_CPU "moxie-cpu" -typedef struct MoxieCPU MoxieCPU ; -typedef struct MoxieCPUClass MoxieCPUClass ; -DECLARE_OBJ_CHECKERS (MoxieCPU, MoxieCPUClass, -MOXIE_CPU ,TYPE_MOXIE_CPU ) +OBJECT_DECLARE_TYPE (MoxieCPU, MoxieCPUClass, + moxie_cpu,MOXIE_CPU )/** * MoxieCPUClass:
target/nios2/cpu.h +2 -4
@@ -32,10 +32,8 @@ typedef struct CPUNios2State CPUNios2State;#define TYPE_NIOS2_CPU "nios2-cpu" -typedef struct Nios2CPU Nios2CPU ; -typedef struct Nios2CPUClass Nios2CPUClass ; -DECLARE_OBJ_CHECKERS (Nios2CPU, Nios2CPUClass, -NIOS2_CPU ,TYPE_NIOS2_CPU ) +OBJECT_DECLARE_TYPE (Nios2CPU, Nios2CPUClass, + nios2_cpu,NIOS2_CPU )/** * Nios2CPUClass:
target/openrisc/cpu.h +2 -4
@@ -29,10 +29,8 @@ struct OpenRISCCPU;#define TYPE_OPENRISC_CPU "or1k-cpu" -typedef struct OpenRISCCPU OpenRISCCPU ; -typedef struct OpenRISCCPUClass OpenRISCCPUClass ; -DECLARE_OBJ_CHECKERS (OpenRISCCPU, OpenRISCCPUClass, -OPENRISC_CPU ,TYPE_OPENRISC_CPU ) +OBJECT_DECLARE_TYPE (OpenRISCCPU, OpenRISCCPUClass, + openrisc_cpu,OPENRISC_CPU )/** * OpenRISCCPUClass:
target/ppc/cpu-qom.h +2 -4
@@ -29,10 +29,8 @@#define TYPE_POWERPC_CPU "powerpc-cpu"#endif -typedef struct PowerPCCPU PowerPCCPU ; -typedef struct PowerPCCPUClass PowerPCCPUClass ; -DECLARE_OBJ_CHECKERS (PowerPCCPU, PowerPCCPUClass, - POWERPC_CPU, TYPE_POWERPC_CPU) +OBJECT_DECLARE_TYPE (PowerPCCPU, PowerPCCPUClass, + powerpc_cpu, POWERPC_CPU)typedef struct CPUPPCState CPUPPCState ;typedef struct ppc_tb_t ppc_tb_t ;
target/riscv/cpu.h +2 -4
@@ -232,10 +232,8 @@ struct CPURISCVState {QEMUTimer *timer;/* Internal timer */ }; -typedef struct RISCVCPU RISCVCPU ; -typedef struct RISCVCPUClass RISCVCPUClass ; -DECLARE_OBJ_CHECKERS (RISCVCPU , RISCVCPUClass, -RISCV_CPU ,TYPE_RISCV_CPU ) +OBJECT_DECLARE_TYPE (RISCVCPU , RISCVCPUClass, + riscv_cpu,RISCV_CPU )/** * RISCVCPUClass:
target/s390x/cpu-qom.h +2 -4
@@ -25,10 +25,8 @@#define TYPE_S390_CPU "s390x-cpu" -typedef struct S390CPU S390CPU ; -typedef struct S390CPUClass S390CPUClass ; -DECLARE_OBJ_CHECKERS (S390CPU , S390CPUClass, - S390_CPU, TYPE_S390_CPU) +OBJECT_DECLARE_TYPE (S390CPU , S390CPUClass, + s390_cpu, S390_CPU)typedef struct S390CPUModel S390CPUModel ;typedef struct S390CPUDef S390CPUDef ;
target/sh4/cpu-qom.h +2 -4
@@ -29,10 +29,8 @@#define TYPE_SH7751R_CPU SUPERH_CPU_TYPE_NAME("sh7751r")#define TYPE_SH7785_CPU SUPERH_CPU_TYPE_NAME("sh7785") -typedef struct SuperHCPU SuperHCPU ; -typedef struct SuperHCPUClass SuperHCPUClass ; -DECLARE_OBJ_CHECKERS (SuperHCPU, SuperHCPUClass, -SUPERH_CPU ,TYPE_SUPERH_CPU ) +OBJECT_DECLARE_TYPE (SuperHCPU, SuperHCPUClass, + superh_cpu,SUPERH_CPU )/** * SuperHCPUClass:
target/sparc/cpu-qom.h +2 -4
@@ -29,10 +29,8 @@#define TYPE_SPARC_CPU "sparc-cpu"#endif -typedef struct SPARCCPU SPARCCPU ; -typedef struct SPARCCPUClass SPARCCPUClass ; -DECLARE_OBJ_CHECKERS (SPARCCPU , SPARCCPUClass, - SPARC_CPU, TYPE_SPARC_CPU) +OBJECT_DECLARE_TYPE (SPARCCPU , SPARCCPUClass, + sparc_cpu, SPARC_CPU)typedef struct sparc_def_t sparc_def_t ;/**
target/tilegx/cpu.h +2 -4
@@ -99,10 +99,8 @@ typedef struct CPUTLGState {#define TYPE_TILEGX_CPU "tilegx-cpu" -typedef struct TileGXCPU TileGXCPU ; -typedef struct TileGXCPUClass TileGXCPUClass ; -DECLARE_OBJ_CHECKERS (TileGXCPU, TileGXCPUClass, -TILEGX_CPU ,TYPE_TILEGX_CPU ) +OBJECT_DECLARE_TYPE (TileGXCPU, TileGXCPUClass, + tilegx_cpu,TILEGX_CPU )/** * TileGXCPUClass:
target/tricore/cpu-qom.h +2 -4
@@ -24,10 +24,8 @@#define TYPE_TRICORE_CPU "tricore-cpu" -typedef struct TriCoreCPU TriCoreCPU ; -typedef struct TriCoreCPUClass TriCoreCPUClass ; -DECLARE_OBJ_CHECKERS (TriCoreCPU, TriCoreCPUClass, - TRICORE_CPU, TYPE_TRICORE_CPU) +OBJECT_DECLARE_TYPE (TriCoreCPU, TriCoreCPUClass, + tricore_cpu, TRICORE_CPU)struct TriCoreCPUClass {/*< private >*/
target/unicore32/cpu-qom.h +2 -4
@@ -16,10 +16,8 @@#define TYPE_UNICORE32_CPU "unicore32-cpu" -typedef struct UniCore32CPU UniCore32CPU ; -typedef struct UniCore32CPUClass UniCore32CPUClass ; -DECLARE_OBJ_CHECKERS (UniCore32CPU, UniCore32CPUClass, -UNICORE32_CPU ,TYPE_UNICORE32_CPU ) +OBJECT_DECLARE_TYPE (UniCore32CPU, UniCore32CPUClass, + unicore32_cpu,UNICORE32_CPU )/** * UniCore32CPUClass:
target/xtensa/cpu-qom.h +2 -4
@@ -34,10 +34,8 @@#define TYPE_XTENSA_CPU "xtensa-cpu" -typedef struct XtensaCPU XtensaCPU ; -typedef struct XtensaCPUClass XtensaCPUClass ; -DECLARE_OBJ_CHECKERS (XtensaCPU, XtensaCPUClass, - XTENSA_CPU, TYPE_XTENSA_CPU) +OBJECT_DECLARE_TYPE (XtensaCPU, XtensaCPUClass, + xtensa_cpu, XTENSA_CPU)typedef struct XtensaConfig XtensaConfig ;
backends/dbus-vmstate.c +2 -4
@@ -21,12 +21,10 @@#include "trace.h" #include "qom/object.h" -typedef struct DBusVMState DBusVMState ; -typedef struct DBusVMStateClass DBusVMStateClass ;#define TYPE_DBUS_VMSTATE "dbus-vmstate" -DECLARE_OBJ_CHECKERS (DBusVMState, DBusVMStateClass, - DBUS_VMSTATE, TYPE_DBUS_VMSTATE) +OBJECT_DECLARE_TYPE (DBusVMState, DBusVMStateClass, + dbus_vmstate, DBUS_VMSTATE)struct DBusVMStateClass {ObjectClass parent_class;
ui/input-barrier.c +2 -4
@@ -20,10 +20,8 @@#include "input-barrier.h" #define TYPE_INPUT_BARRIER "input-barrier" -typedef struct InputBarrier InputBarrier ; -typedef struct InputBarrierClass InputBarrierClass ; -DECLARE_OBJ_CHECKERS (InputBarrier, InputBarrierClass, - INPUT_BARRIER, TYPE_INPUT_BARRIER) +OBJECT_DECLARE_TYPE (InputBarrier, InputBarrierClass, + input_barrier, INPUT_BARRIER)#define MAX_HELLO_LENGTH 1024
ui/input-linux.c +2 -4
@@ -31,10 +31,8 @@ static bool linux_is_button(unsigned int lnx) }#define TYPE_INPUT_LINUX "input-linux" -typedef struct InputLinux InputLinux ; -typedef struct InputLinuxClass InputLinuxClass ; -DECLARE_OBJ_CHECKERS (InputLinux, InputLinuxClass, - INPUT_LINUX, TYPE_INPUT_LINUX) +OBJECT_DECLARE_TYPE (InputLinux, InputLinuxClass, + input_linux, INPUT_LINUX)struct InputLinux {
Signature · 1 line
2.26.2
PATCH v4 16/18 Use OBJECT_DECLARE_TYPE where possible (pass 2)
In reply to Eduardo HabkostReplace DECLARE_OBJ_CHECKERS with OBJECT_DECLARE_TYPE where the typedefs can be safely removed.
Generated running:
$ ./scripts/codeconverter/converter.py -i \ --pattern=DeclareObjCheckers $(git grep -l '' -- '*.[ch]')
---
Changes v3 -> v4: none
Changes series v2 -> v3: this is a new patch added in series v3
The script was re-run after rebase and after additional patches were added to this series.
This is being submitted as a separate patch to make review easier, but it can be squashed into the previous patch once it gets reviewed.
---
Cc: David Gibson <[email protected]>
Cc: "Cédric Le Goater" <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- include/hw/ppc/xive.h | 6 ++---- target/rx/cpu-qom.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-)
include/hw/ppc/xive.h +2 -4
@@ -345,12 +345,10 @@ struct XiveRouter {XiveFabric *xfb; }; -typedef struct XiveRouter XiveRouter ;#define TYPE_XIVE_ROUTER "xive-router" -typedef struct XiveRouterClass XiveRouterClass ; -DECLARE_OBJ_CHECKERS (XiveRouter, XiveRouterClass, - XIVE_ROUTER, TYPE_XIVE_ROUTER) +OBJECT_DECLARE_TYPE (XiveRouter, XiveRouterClass, + xive_router, XIVE_ROUTER)struct XiveRouterClass {SysBusDeviceClass parent;
target/rx/cpu-qom.h +2 -4
@@ -26,10 +26,8 @@#define TYPE_RX62N_CPU RX_CPU_TYPE_NAME("rx62n") -typedef struct RXCPU RXCPU ; -typedef struct RXCPUClass RXCPUClass ; -DECLARE_OBJ_CHECKERS (RXCPU , RXCPUClass, -RX_CPU ,TYPE_RX_CPU ) +OBJECT_DECLARE_TYPE (RXCPU , RXCPUClass, + rx_cpu,RX_CPU )/* * RXCPUClass:
Signature · 1 line
2.26.2
PATCH v4 17/18 Use OBJECT_DECLARE_TYPE where possible (pass 3)
In reply to Eduardo HabkostReplace DECLARE_OBJ_CHECKERS with OBJECT_DECLARE_TYPE where the typedefs can be safely removed.
Generated running:
$ ./scripts/codeconverter/converter.py -i \ --pattern=DeclareObjCheckers $(git grep -l '' -- '*.[ch]')
---
Changes series v3 -> v4: this is a new patch added in series v4
The script was re-run after series rebase.
This is being submitted as a separate patch to make review easier, but it can be squashed into the previous patch once it gets reviewed.
---
Cc: Peter Maydell <[email protected]>
Cc: [email protected]
Cc: [email protected]
--- include/hw/arm/armsse.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
include/hw/arm/armsse.h +2 -4
@@ -108,10 +108,8 @@#include "qom/object.h" #define TYPE_ARM_SSE "arm-sse" -typedef struct ARMSSE ARMSSE ; -typedef struct ARMSSEClass ARMSSEClass ; -DECLARE_OBJ_CHECKERS (ARMSSE , ARMSSEClass, -ARM_SSE ,TYPE_ARM_SSE ) +OBJECT_DECLARE_TYPE (ARMSSE , ARMSSEClass, + arm_sse,ARM_SSE )/* * These type names are for specific IoTKit subsystems; other than
Signature · 1 line
2.26.2
PATCH v4 18/18 Use OBJECT_DECLARE_SIMPLE_TYPE when possible
In reply to Eduardo HabkostGenerated using:
$ ./scripts/codeconverter/converter.py -i \ --pattern=ObjectDeclareType $(git grep -l '' -- '*.[ch]')
---
Changes v3 -> v4: none
Changes v2 -> v3: none
Changes v1 -> v2: none
---
Cc: "Marc-André Lureau" <[email protected]>
Cc: "Daniel P. Berrangé" <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: [email protected]
--- include/authz/list.h | 7 ++----- include/authz/listfile.h | 7 ++----- include/authz/pamacct.h | 7 ++----- include/authz/simple.h | 7 ++----- include/crypto/secret_keyring.h | 7 ++----- include/io/dns-resolver.h | 7 ++----- include/io/net-listener.h | 7 ++----- include/sysemu/vhost-user-backend.h | 7 ++----- backends/dbus-vmstate.c | 7 ++----- ui/input-barrier.c | 7 ++----- ui/input-linux.c | 7 ++----- 11 files changed, 22 insertions(+), 55 deletions(-)
include/authz/list.h +2 -5
@@ -27,8 +27,8 @@#define TYPE_QAUTHZ_LIST "authz-list" -OBJECT_DECLARE_TYPE (QAuthZList, QAuthZListClass, - qauthz_list,QAUTHZ_LIST ) +OBJECT_DECLARE_SIMPLE_TYPE (QAuthZList, qauthz_list, +QAUTHZ_LIST , QAuthZClass)
@@ -68,9 +68,6 @@ struct QAuthZList { }; -struct QAuthZListClass { -QAuthZClass parent_class; -}; QAuthZList *qauthz_list_new(const char *id,
include/authz/listfile.h +2 -5
@@ -27,8 +27,8 @@#define TYPE_QAUTHZ_LIST_FILE "authz-list-file" -OBJECT_DECLARE_TYPE (QAuthZListFile, QAuthZListFileClass, - qauthz_list_file,QAUTHZ_LIST_FILE ) +OBJECT_DECLARE_SIMPLE_TYPE (QAuthZListFile, qauthz_list_file, +QAUTHZ_LIST_FILE , QAuthZClass)
@@ -87,9 +87,6 @@ struct QAuthZListFile { }; -struct QAuthZListFileClass { -QAuthZClass parent_class; -}; QAuthZListFile *qauthz_list_file_new(const char *id,
include/authz/pamacct.h +2 -5
@@ -27,8 +27,8 @@#define TYPE_QAUTHZ_PAM "authz-pam" -OBJECT_DECLARE_TYPE (QAuthZPAM, QAuthZPAMClass, - qauthz_pam,QAUTHZ_PAM ) +OBJECT_DECLARE_SIMPLE_TYPE (QAuthZPAM, qauthz_pam, +QAUTHZ_PAM , QAuthZClass)
@@ -79,9 +79,6 @@ struct QAuthZPAM { }; -struct QAuthZPAMClass { -QAuthZClass parent_class; -}; QAuthZPAM *qauthz_pam_new(const char *id,
include/authz/simple.h +2 -5
@@ -26,8 +26,8 @@#define TYPE_QAUTHZ_SIMPLE "authz-simple" -OBJECT_DECLARE_TYPE (QAuthZSimple, QAuthZSimpleClass, - qauthz_simple,QAUTHZ_SIMPLE ) +OBJECT_DECLARE_SIMPLE_TYPE (QAuthZSimple, qauthz_simple, +QAUTHZ_SIMPLE , QAuthZClass)
@@ -62,9 +62,6 @@ struct QAuthZSimple { }; -struct QAuthZSimpleClass { -QAuthZClass parent_class; -}; QAuthZSimple *qauthz_simple_new(const char *id,
include/crypto/secret_keyring.h +2 -5
@@ -26,8 +26,8 @@#include "crypto/secret_common.h" #define TYPE_QCRYPTO_SECRET_KEYRING "secret_keyring" -OBJECT_DECLARE_TYPE (QCryptoSecretKeyring, QCryptoSecretKeyringClass, - qcrypto_secret_keyring, QCRYPTO_SECRET_KEYRING) +OBJECT_DECLARE_SIMPLE_TYPE (QCryptoSecretKeyring, qcrypto_secret_keyring, + QCRYPTO_SECRET_KEYRING, QCryptoSecretCommonClass)struct QCryptoSecretKeyring {
@@ -36,8 +36,5 @@ struct QCryptoSecretKeyring { }; -struct QCryptoSecretKeyringClass { -QCryptoSecretCommonClass parent; -};#endif /* QCRYPTO_SECRET_KEYRING_H */
include/io/dns-resolver.h +2 -5
@@ -26,8 +26,8 @@#include "io/task.h" #define TYPE_QIO_DNS_RESOLVER "qio-dns-resolver" -OBJECT_DECLARE_TYPE (QIODNSResolver, QIODNSResolverClass, - qio_dns_resolver,QIO_DNS_RESOLVER ) +OBJECT_DECLARE_SIMPLE_TYPE (QIODNSResolver, qio_dns_resolver, +QIO_DNS_RESOLVER , ObjectClass)/**
@@ -133,9 +133,6 @@ struct QIODNSResolver {Object parent; }; -struct QIODNSResolverClass { -ObjectClass parent; -};/**
include/io/net-listener.h +2 -5
@@ -25,8 +25,8 @@#include "qom/object.h" #define TYPE_QIO_NET_LISTENER "qio-net-listener" -OBJECT_DECLARE_TYPE (QIONetListener, QIONetListenerClass, - qio_net_listener, QIO_NET_LISTENER) +OBJECT_DECLARE_SIMPLE_TYPE (QIONetListener, qio_net_listener, + QIO_NET_LISTENER, ObjectClass) typedef void (*QIONetListenerClientFunc)(QIONetListener *listener,
@@ -58,9 +58,6 @@ struct QIONetListener {GDestroyNotify io_notify; }; -struct QIONetListenerClass { -ObjectClass parent; -};/**
include/sysemu/vhost-user-backend.h +2 -5
@@ -22,13 +22,10 @@#include "io/channel.h" #define TYPE_VHOST_USER_BACKEND "vhost-user-backend" -OBJECT_DECLARE_TYPE (VhostUserBackend, VhostUserBackendClass, - vhost_user_backend, VHOST_USER_BACKEND) +OBJECT_DECLARE_SIMPLE_TYPE (VhostUserBackend, vhost_user_backend, + VHOST_USER_BACKEND, ObjectClass) -struct VhostUserBackendClass { -ObjectClass parent_class; -};struct VhostUserBackend {/* private */
backends/dbus-vmstate.c +2 -5
@@ -23,12 +23,9 @@#define TYPE_DBUS_VMSTATE "dbus-vmstate" -OBJECT_DECLARE_TYPE (DBusVMState, DBusVMStateClass, - dbus_vmstate, DBUS_VMSTATE) +OBJECT_DECLARE_SIMPLE_TYPE (DBusVMState, dbus_vmstate, + DBUS_VMSTATE, ObjectClass) -struct DBusVMStateClass { -ObjectClass parent_class; -};struct DBusVMState {Object parent;
ui/input-barrier.c +2 -5
@@ -20,8 +20,8 @@#include "input-barrier.h" #define TYPE_INPUT_BARRIER "input-barrier" -OBJECT_DECLARE_TYPE (InputBarrier, InputBarrierClass, - input_barrier, INPUT_BARRIER) +OBJECT_DECLARE_SIMPLE_TYPE (InputBarrier, input_barrier, + INPUT_BARRIER, ObjectClass)#define MAX_HELLO_LENGTH 1024
@@ -44,9 +44,6 @@ struct InputBarrier {char buffer[MAX_HELLO_LENGTH ]; }; -struct InputBarrierClass { -ObjectClass parent_class; -};static const char *cmd_names[] = { [barrierCmdCNoop] ="CNOP" ,
ui/input-linux.c +2 -5
@@ -31,8 +31,8 @@ static bool linux_is_button(unsigned int lnx) }#define TYPE_INPUT_LINUX "input-linux" -OBJECT_DECLARE_TYPE (InputLinux, InputLinuxClass, - input_linux, INPUT_LINUX) +OBJECT_DECLARE_SIMPLE_TYPE (InputLinux, input_linux, + INPUT_LINUX, ObjectClass)struct InputLinux {
@@ -65,9 +65,6 @@ struct InputLinux {QTAILQ_ENTRY (InputLinux) next; }; -struct InputLinuxClass { -ObjectClass parent_class; -}; static QTAILQ_HEAD(, InputLinux) inputs = QTAILQ_HEAD_INITIALIZER(inputs);
Signature · 1 line
2.26.2
Quoted 7 lines · Eduardo Habkost
Latest version of this series can be found at the branch:
https://github.com/ehabkost/qemu-hacks/tree/work/qom-macros-autoconvertThis is an extension of the series previously submitted by Daniel[1], including a script that will convert existing type checker macros automatically.
Quoted 5 lines
[1] https://lore.kernel.org/qemu-devel/20200723181410.3145233-1-berrange@redh=
at.com/Link to series v4:
https://github.com/ehabkost/qemu-hacks/tree/work/qom-macros-autoconvert-v4
I'm queueing this on machine-next.
Signature · 1 line
Eduardo