This series makes some cleanups to the structures tracking overall machine state for spapr (-machine pseries). First the old sPAPREnvironment structure (which predates the generic MachineState structure) is merged into a spapr specific subclass of MachineState. Then some obsolete fields are cleaned up.
If I receive a review or two, with nothing terribly wrong, I'll merge this into the spapr-next branch. Changes since v1: * Don't rename 'spapr' variables to 'sm' everywhere - it was needless churn * Fix some small style errors David Gibson (4): spapr: Merge sPAPREnvironment into sPAPRMachineState spapr: Remove obsolete ram_limit field from sPAPRMachineState spapr: Remove obsolete entry_point field from sPAPRMachineState spapr: Add sPAPRMachineClass hw/char/spapr_vty.c | 6 +-- hw/intc/xics.c | 20 ++++----- hw/intc/xics_kvm.c | 2 +- hw/net/spapr_llan.c | 12 +++--- hw/nvram/spapr_nvram.c | 4 +- hw/ppc/spapr.c | 100 +++++++++++++++++++------------------------- hw/ppc/spapr_events.c | 13 ++++-- hw/ppc/spapr_hcall.c | 39 +++++++++-------- hw/ppc/spapr_iommu.c | 8 ++-- hw/ppc/spapr_pci.c | 37 ++++++++-------- hw/ppc/spapr_rtas.c | 38 ++++++++--------- hw/ppc/spapr_rtc.c | 4 +- hw/ppc/spapr_vio.c | 15 +++---- include/hw/pci-host/spapr.h | 10 +++-- include/hw/ppc/spapr.h | 51 +++++++++++++++++----- include/hw/ppc/spapr_vio.h | 4 +- 16 files changed, 199 insertions(+), 164 deletions(-) -- 2.1.0
