For historical reasons construction of the guest device tree in spapr is divided between spapr_create_fdt_skel() which is called at init time, and spapr_build_fdt() which runs at reset time. Over time, more and more things have needed to be moved to reset time.
This series consolidates all the device tree construction to reset time, with some minor cleanups along the way. This will help to make it more maintainable in future. Changes since v2: * Removed a leftover reference to a variable called 'stdout', shadowing the standard library stdout Changes since v1: * Fixed a memory leak introduced by 1/12 (spotted by Thomas Huth) * Removed one patch that's already merged in ppc-for-2.8 David Gibson (12): pseries: Split device tree construction from device tree load pseries: Remove rtas_addr and fdt_addr fields from machinestate pseries: Make spapr_create_fdt_skel() get information from machine state pseries: Move adding of fdt reserve map entries pseries: Consolidate RTAS loading pseries: Move construction of /interrupt-controller fdt node pseries: Consolidate construction of /chosen device tree node pseries: Consolidate construction of /rtas device tree node pseries: Move /event-sources construction to spapr_build_fdt() pseries: Move /hypervisor node construction to fdt_build_fdt() pseries: Consolidate construction of /vdevice device tree node pseries: Remove spapr_create_fdt_skel() hw/intc/xics_spapr.c | 22 ++ hw/ppc/spapr.c | 560 +++++++++++++++++++++------------------------ hw/ppc/spapr_events.c | 21 +- hw/ppc/spapr_rtas.c | 91 +++----- hw/ppc/spapr_vio.c | 40 ++-- include/hw/ppc/spapr.h | 12 +- include/hw/ppc/spapr_vio.h | 4 +- include/hw/ppc/xics.h | 1 + 8 files changed, 361 insertions(+), 390 deletions(-) -- 2.7.4