spapr: Merge sPAPREnvironment into sPAPRMachineState
commit28e0204254c3f03e77106056a3a5730c4b8a2ac6
authorDavid Gibson <david@gibson.dropbear.id.au>
Thu, 2 Jul 2015 06:23:04 +0000 (2 16:23 +1000)
committerAlexander Graf <agraf@suse.de>
Tue, 7 Jul 2015 15:44:50 +0000 (7 17:44 +0200)
treed192162b52ee317d93c3aaa2e20997db6718d5a4
parent780184aae65d72378737e9cdb8fb61b0121e1e21
spapr: Merge sPAPREnvironment into sPAPRMachineState

The code for -machine pseries maintains a global sPAPREnvironment structure
which keeps track of general state information about the guest platform.
This predates the existence of the MachineState structure, but performs
basically the same function.

Now that we have the generic MachineState, fold sPAPREnvironment into
sPAPRMachineState, the pseries specific subclass of MachineState.

This is mostly a matter of search and replace, although a few places which
relied on the global spapr variable are changed to find the structure via
qdev_get_machine().

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
16 files changed:
hw/char/spapr_vty.c
hw/intc/xics.c
hw/intc/xics_kvm.c
hw/net/spapr_llan.c
hw/nvram/spapr_nvram.c
hw/ppc/spapr.c
hw/ppc/spapr_events.c
hw/ppc/spapr_hcall.c
hw/ppc/spapr_iommu.c
hw/ppc/spapr_pci.c
hw/ppc/spapr_rtas.c
hw/ppc/spapr_rtc.c
hw/ppc/spapr_vio.c
include/hw/pci-host/spapr.h
include/hw/ppc/spapr.h
include/hw/ppc/spapr_vio.h