[Qemu-commits] [qemu/qemu] 54c6de: hw/ppc/spapr_rtc: Remove bad class_size value

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 54c6de864fb6286ce8e9035f10f3193d2caf0897
      
https://github.com/qemu/qemu/commit/54c6de864fb6286ce8e9035f10f3193d2caf0897
  Author: Thomas Huth <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr_rtc.c

  Log Message:
  -----------
  hw/ppc/spapr_rtc: Remove bad class_size value

class_size = sizeof(XICSStateClass) does not make much sense
in the RTC code and likely was just a copy-n-paste error.
Let's simply remove it.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 7d94a30b549281d4d780fb9a5cca3dae378329d4
      
https://github.com/qemu/qemu/commit/7d94a30b549281d4d780fb9a5cca3dae378329d4
  Author: Sukadev Bhattiprolu <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M target-ppc/kvm.c

  Log Message:
  -----------
  target-ppc: Define kvmppc_read_int_dt()

Extract code from the function kvmppc_read_int_cpu_dt() that actually
reads the file into a separate function, so it can be called from
other places.

Signed-off-by: Sukadev Bhattiprolu <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 3dc0a66d26bfc3820ab46aaf245cabf26fcf1eb4
      
https://github.com/qemu/qemu/commit/3dc0a66d26bfc3820ab46aaf245cabf26fcf1eb4
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: Add /system-id

Section B.6.2.1 Root Node Properties of PAPR specification defines
a set of properties which shall be present in the device tree root,
one of these properties is "system-id" which "should be unique across
all systems and all manufacturers". Since UUID is meant to be unique,
it makes sense to use it as "system-id".

This adds "system-id" property to the device tree root when not empty.

Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: aec39c5349acc4b33711288abbbaf747e21b04b7
      
https://github.com/qemu/qemu/commit/aec39c5349acc4b33711288abbbaf747e21b04b7
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Remove redundant setting of mc->name for pseries-2.5 machine

98cec76 "machine: Set MachineClass::name automatically" removed the setting
of mc->name for the pseries machine types, since it can be derived
automatically from the type names constructed with MACHINE_TYPE_NAME().

Unfortunately fb0fc8f "spapr: Create pseries-2.5 machine" went in later and
brought one of them back.

This removes it again.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: 1c5f29bbc8dac5f5d109a4aaa761e0dbb9eeea8d
      
https://github.com/qemu/qemu/commit/1c5f29bbc8dac5f5d109a4aaa761e0dbb9eeea8d
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Rearrange versioned machine type code

hw/ppc/spapr.c has a number of definitions related to the various versioned
machine types ("pseries-2.1" .. "pseries-2.5") it defines.  These are
mostly arranged by type of function first, then machine version second, and
it's not consistent about whether it goes in increasing or decreasing
version order.

This rearranges the code to keep all the definitions for a particular
machine version together, and arrange then consistently in order most
recent to least recent.

This brings us closer to matching the way PC does things, and makes later
cleanups easier to follow.

Apart from adding some comments marking each section, this is a pure
mechanical rearrangement with no semantic changes.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: 64f0f70a00ec62f10a1fd333a3a3a6bf513fc1a0
      
https://github.com/qemu/qemu/commit/64f0f70a00ec62f10a1fd333a3a3a6bf513fc1a0
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Remove redundant calls to spapr_machine_initfn()

The instance_init() functions for several of the pseries-x.y versioned
machine types explicitly call spapr_machine_initfn().  But that's the
instance_init function for the common parent of all those machine types,
so will already have been called beforehand by the QOM infrastructure.

Remove the redundant calls.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: 0eb9054c6040f7216be99c23793f001d52765ce9
      
https://github.com/qemu/qemu/commit/0eb9054c6040f7216be99c23793f001d52765ce9
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Remove versions from mc->desc

Currently, the versioned spapr machine types put the machine type version
into the description string.  PC does not do this, using just the name
itself to distinguish.  Doing the same lets us move setting the description
into the common base class, simplifying the code slightly.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: 877f8931b99e2377a180fd43a1e5fc2b707e9c52
      
https://github.com/qemu/qemu/commit/877f8931b99e2377a180fd43a1e5fc2b707e9c52
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M include/hw/boards.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  Move SET_MACHINE_COMPAT macro to boards.h

pc.h defines a SET_MACHINE_COMPAT macro to make setting up compat_props
for the various PC machine versions less verbose.  There's nothing
inherently PC specific about it, though, so move it to boards.h where other
versioned machine types (like pseries-*) can use it.

While we're doing that, change it's indentation to be a bit more regular.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: f949b4e5f5f8ce51d89d22567741c27fdcb0c106
      
https://github.com/qemu/qemu/commit/f949b4e5f5f8ce51d89d22567741c27fdcb0c106
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Use SET_MACHINE_COMPAT

To make the spapr_machine_*_class_init() functions a little less bulky.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: 5013c5474658c1adea6d5448979dfe399b27e194
      
https://github.com/qemu/qemu/commit/5013c5474658c1adea6d5448979dfe399b27e194
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: DEFINE_SPAPR_MACHINE

At the moment all the class_init functions and TypeInfo structures for the
various versioned pseries machine types are open-coded.  As more versions
are created this is getting increasingly clumsy.

This patch borrows the approach used in PC, using a DEFINE_SPAPR_MACHINE()
macro to construct most of the boilerplate from simpler 'class_options' and
'instance_options' functions.

This patch makes a small semantic change - the versioned machine types are
now registered through machine_init() instead of type_init().  Since the
new way is how PC already did it, I'm assuming that's correct.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Sam Bobroff <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: fc9f38c3c0f42b7e98957b646976ee5b63f23806
      
https://github.com/qemu/qemu/commit/fc9f38c3c0f42b7e98957b646976ee5b63f23806
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Restructure class_options functions

Currently each of the *_class_options() functions for the pseries-2.1 ..
pseries-2.5 machine types are standalone.  This will become harder to
maintain as new versions are added.

This patch restructures them similarly to x86 where each function calls
the one from the next version, then overrides anything necessary for
compatibility with the specific version and older.

The default behaviour - that for the most recent machine are set up in
the base class initializer spapr_machine_class_init().  Previously it had
some things set up to default to older behaviour with the more recent
machines overriding it.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: fccbc785003f4575a3f22a4d230f9aaa1327788e
      
https://github.com/qemu/qemu/commit/fccbc785003f4575a3f22a4d230f9aaa1327788e
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Improve setting of default machine version

This tweaks the way the default machine version is controlled, so that
there will be a bit less churn when each new version is introduced.

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: 4b23699c828d19360d6ca5b74036573decb62194
      
https://github.com/qemu/qemu/commit/4b23699c828d19360d6ca5b74036573decb62194
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  pseries: Add pseries-2.6 machine type

Signed-off-by: David Gibson <address@hidden>
Reviewed-by: Alexey Kardashevskiy <address@hidden>


  Commit: 57040d451315320b7d27cf543a03a883913d45fb
      
https://github.com/qemu/qemu/commit/57040d451315320b7d27cf543a03a883913d45fb
  Author: Thomas Huth <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c
    M include/hw/ppc/spapr.h

  Log Message:
  -----------
  hw/ppc/spapr: Use XHCI as host controller for new spapr machines

The OHCI has some bugs and performance issues, so for
newer machines it's preferable to use XHCI instead.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 215e209846d37a2e4b3e2de1f901e808837480dd
      
https://github.com/qemu/qemu/commit/215e209846d37a2e4b3e2de1f901e808837480dd
  Author: Cao jin <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr_vio.c
    M include/hw/ppc/spapr_vio.h

  Log Message:
  -----------
  spapr vio: fix to incomplete QOMify

Signed-off-by: Cao jin <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 87bbdd9cafe58ce50d462307394d51af98d50d74
      
https://github.com/qemu/qemu/commit/87bbdd9cafe58ce50d462307394d51af98d50d74
  Author: David Gibson <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  hw/ppc/spapr: fix spapr->kvm_type leak

Cc: David Gibson <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: address@hidden
Signed-off-by: Li Zhijian <address@hidden>
[fixed return type of spapr_machine_finalizefn()]
Signed-off-by: David Gibson <address@hidden>


  Commit: 10e1b75961fcd4165a76d04bdcc5065aac1175f1
      
https://github.com/qemu/qemu/commit/10e1b75961fcd4165a76d04bdcc5065aac1175f1
  Author: Peter Maydell <address@hidden>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    M hw/ppc/spapr.c
    M hw/ppc/spapr_rtc.c
    M hw/ppc/spapr_vio.c
    M include/hw/boards.h
    M include/hw/i386/pc.h
    M include/hw/ppc/spapr.h
    M include/hw/ppc/spapr_vio.h
    M target-ppc/kvm.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160111' into 
staging

ppc patch queue 2016-01-11

Biggest content is a thorough cleanups of spapr machine type handling.
Also contains several other minor cleanups, bugfixes and extensions.

# gpg: Signature made Mon 11 Jan 2016 04:34:38 GMT using RSA key ID 20D9B392
# gpg: Good signature from "David Gibson <address@hidden>"
# gpg:                 aka "David Gibson (Red Hat) <address@hidden>"
# gpg:                 aka "David Gibson (ozlabs.org) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.6-20160111:
  hw/ppc/spapr: fix spapr->kvm_type leak
  spapr vio: fix to incomplete QOMify
  hw/ppc/spapr: Use XHCI as host controller for new spapr machines
  pseries: Add pseries-2.6 machine type
  pseries: Improve setting of default machine version
  pseries: Restructure class_options functions
  pseries: DEFINE_SPAPR_MACHINE
  pseries: Use SET_MACHINE_COMPAT
  Move SET_MACHINE_COMPAT macro to boards.h
  pseries: Remove versions from mc->desc
  pseries: Remove redundant calls to spapr_machine_initfn()
  pseries: Rearrange versioned machine type code
  pseries: Remove redundant setting of mc->name for pseries-2.5 machine
  spapr: Add /system-id
  target-ppc: Define kvmppc_read_int_dt()
  hw/ppc/spapr_rtc: Remove bad class_size value

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d21ccd7bb983...10e1b75961fc