[Qemu-devel] [PATCH v3 0/7] machine registration: Use QOM, eliminate QEMUMachine

[Eduardo Habkost <ehabkost@redhat.com>]

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

Git branch:
  git://github.com/ehabkost/qemu-hacks.git work/qemumachine-kill

Changes v2 -> v3:
* Rebased on top of:
  Subject: [Qemu-devel] [PATCH 00/10] Fix machine class names to use the
  "-machine" suffix
* At "Use DEFINE_MACHINE to register all machines":
  * Not a RFC anymore
  * I won't split it into per-architecture patches anymore, to make it easier
    to merge through Andreas' QOM tree
  * Replace "machine_machine" with "machine" in new variable and function
    names.
    Suggested-by: Michael Walle <michael@walle.cc>
  * Eliminate empty mips_malta_machine_init() and sun4u_machine_init()
    functions
* Remove "pc: Use DEFINE_MACHINE to implement DEFINE_PC_MACHINE"

Changes v1 -> v2:
* At "Use DEFINE_MACHINE to register all machines":
  * Fix trailing spaces and newlines
  * Don't touch "//" comments on lines that we are not changing
  * Break long lines manually

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
  mac_world: Break long line
  Use DEFINE_MACHINE to register all machines
  machine: Eliminate QEMUMachine and qemu_register_machine()

 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                     |  22 ++--
 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                    |  25 ++---
 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                         | 166 ++++++++++++++++---------------
 hw/sparc64/sun4u.c                       |  58 ++++++-----
 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                      |  44 ++++----
 include/qemu/typedefs.h                  |   1 -
 include/sysemu/blockdev.h                |   2 +-
 include/sysemu/sysemu.h                  |   2 +-
 vl.c                                     |  36 -------
 61 files changed, 591 insertions(+), 834 deletions(-)

-- 
2.1.0