[Qemu-devel] [PATCHv2 00/10] Clean up pseries machine versioning

[David Gibson]

Thomas Huth recently posted a patches to switch the default USB
controller for the pseries machine type to xHCI, which necessitated
creating a pseries-2.6 machine type version.

That raised a bunch of comments suggesting better ways we could manage
the machine versioning for pseries.

This is an attempt to implement those suggestions.  For the most part
it makes the handling of machine versions for pseries more similar to
the handling of PC machine versions.

Eduardo,
  - Any opinions on how 5/10 (the only patch which isn't spapr
    specific) should be merged?

Otherwise I'm hoping to get some ACKs from outside Red Hat, at which
point I'll merge these into my ppc-for-2.6 tree, to be pushed upstream
once the 2.6 tree opens.

Changes in v2:
 * General rework
 * Moved most actual fixes to existing behaviour earlier in the series
   for clarity
 * Now also avoid redundant calls to the base class instance_init function

David Gibson (10):
  pseries: Remove redundant setting of mc->name for pseries-2.5 machine
  pseries: Rearrange versioned machine type code
  pseries: Remove redundant calls to spapr_machine_initfn()
  pseries: Remove versions from mc->desc
  Move SET_MACHINE_COMPAT macro to boards.h
  pseries: Use SET_MACHINE_COMPAT
  pseries: DEFINE_SPAPR_MACHINE
  pseries: Restructure class_options functions
  pseries: Improve setting of default machine version
  pseries: Add pseries-2.6 machine type

 hw/ppc/spapr.c       | 238 +++++++++++++++++++++++++--------------------------
 include/hw/boards.h  |   9 ++
 include/hw/i386/pc.h |   8 --
 3 files changed, 127 insertions(+), 128 deletions(-)

-- 
2.5.0