This converts all code using QEMUMachine to register a QOM class directly, using a new macro: DEFINE_MACHINE.
Python script used to convert all machines automatically can be seen at: https://gist.github.com/ehabkost/582fe4969205975febb2#file-qemumachine-eliminate-py Cc: Richard Henderson <[email protected]> Cc: Peter Maydell <[email protected]> Cc: Li Guang <[email protected]> Cc: Antony Pavlov <[email protected]> Cc: Evgeny Voevodin <[email protected]> Cc: Maksim Kozlov <[email protected]> Cc: Igor Mitsyanko <[email protected]> Cc: Dmitry Solodkiy <[email protected]> Cc: Rob Herring <[email protected]> Cc: Peter Chubb <[email protected]> Cc: Jan Kiszka <[email protected]> Cc: Andrzej Zaborowski <[email protected]> Cc: Peter Crosthwaite <[email protected]> Cc: "Edgar E. Iglesias" <[email protected]> Cc: Michael Walle <[email protected]> Cc: Aurelien Jarno <[email protected]> Cc: Leon Alrae <[email protected]> Cc: "Hervé Poussineau" <[email protected]> Cc: Jia Liu <[email protected]> Cc: Alexander Graf <[email protected]> Cc: Scott Wood <[email protected]> Cc: "Andreas Färber" <[email protected]> Cc: Magnus Damm <[email protected]> Cc: Fabien Chouteau <[email protected]> Cc: Blue Swirl <[email protected]> Cc: Mark Cave-Ayland <[email protected]> Cc: Bastian Koppelmann <[email protected]> Cc: Guan Xuetao <[email protected]> Cc: Max Filippov <[email protected]> Cc: "Michael S. Tsirkin" <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: [email protected] Cc: [email protected] Eduardo Habkost (7): exynos4: Use EXYNOS4210_NCPUS instead of max_cpus on error message exynos4: Use MachineClass instead of exynos4_machines array exynos4: Declare each QEMUMachine as a separate variable machine: DEFINE_MACHINE macro pc: Use DEFINE_MACHINE to implement DEFINE_PC_MACHINE [RFC] Use DEFINE_MACHINE to register all machines machine: Eliminate QEMUMachine and qemu_register_machine() hw/acpi/piix4.c | 2 +- hw/alpha/dp264.c | 18 ++-- hw/arm/collie.c | 14 +-- hw/arm/cubieboard.c | 16 ++- hw/arm/digic_boards.c | 14 +-- hw/arm/exynos4_boards.c | 39 ++++--- hw/arm/gumstix.c | 29 +++--- hw/arm/highbank.c | 33 +++--- hw/arm/integratorcp.c | 14 +-- hw/arm/kzm.c | 14 +-- hw/arm/mainstone.c | 14 +-- hw/arm/musicpal.c | 14 +-- hw/arm/netduino2.c | 14 +-- hw/arm/nseries.c | 29 +++--- hw/arm/omap_sx1.c | 25 ++--- hw/arm/palm.c | 14 +-- hw/arm/realview.c | 61 ++++++----- hw/arm/spitz.c | 51 +++++----- hw/arm/stellaris.c | 25 ++--- hw/arm/tosa.c | 14 +-- hw/arm/versatilepb.c | 29 +++--- hw/arm/xilinx_zynq.c | 20 ++-- hw/arm/xlnx-ep108.c | 14 +-- hw/arm/z2.c | 14 +-- hw/core/null-machine.c | 16 ++- hw/cris/axis_dev88.c | 16 ++- hw/lm32/lm32_boards.c | 33 +++--- hw/lm32/milkymist.c | 16 ++- hw/m68k/an5206.c | 14 +-- hw/m68k/dummy_m68k.c | 14 +-- hw/m68k/mcf5208.c | 16 ++- hw/microblaze/petalogix_ml605_mmu.c | 16 ++- hw/microblaze/petalogix_s3adsp1800_mmu.c | 16 ++- hw/mips/mips_fulong2e.c | 14 +-- hw/mips/mips_jazz.c | 29 +++--- hw/mips/mips_malta.c | 24 ++--- hw/mips/mips_mipssim.c | 14 +-- hw/mips/mips_r4k.c | 14 +-- hw/moxie/moxiesim.c | 16 ++- hw/openrisc/openrisc_sim.c | 18 ++-- hw/ppc/e500plat.c | 18 ++-- hw/ppc/mac_oldworld.c | 24 ++--- hw/ppc/mpc8544ds.c | 16 ++- hw/ppc/ppc405_boards.c | 27 +++-- hw/ppc/ppc440_bamboo.c | 14 +-- hw/ppc/prep.c | 18 ++-- hw/ppc/virtex_ml507.c | 14 +-- hw/sh4/r2d.c | 14 +-- hw/sh4/shix.c | 16 ++- hw/sparc/leon3.c | 14 +-- hw/sparc/sun4m.c | 170 ++++++++++++++++--------------- hw/sparc64/sun4u.c | 76 +++++++------- hw/tricore/tricore_testboard.c | 16 ++- hw/unicore32/puv3.c | 16 ++- hw/xenpv/xen_machine_pv.c | 18 ++-- hw/xtensa/sim.c | 18 ++-- hw/xtensa/xtfpga.c | 59 ++++++----- include/hw/boards.h | 45 ++++---- include/hw/i386/pc.h | 15 +-- include/qemu/typedefs.h | 1 - include/sysemu/blockdev.h | 2 +- include/sysemu/sysemu.h | 2 +- vl.c | 37 ------- 63 files changed, 606 insertions(+), 861 deletions(-) -- 2.1.0
