Hello Peter, Following up on your remark about ugly naming as a consequence of my CPU reset patches and my OMAP field rename, here's a few more patches.
Patch 1 is spelling fixes in a comment and could be pulled into 1.1. Patches 2-7 fix some more naming ugliness that I missed when running because they were just "cpu->cpu". Again, fix by using "mpu" rather than "cpu". Patches 8-19 are what I had in mind with my choice of variable placement in the reset series. They clean up expressions in some targets, at the same time incur changes to other targets which would be needed for wiring up the CPU later anyway. Patches 20-22 are preparations cherry-picked from QOM CPUState part 4, which I'm including here since you indicated there might be a conflict with cp15 or qemu-linaro work. Please ack and indicate which merge order you would prefer. Regards, Andreas Cc: Peter Maydell <peter.mayd...@linaro.org> Andreas Färber (22): arm_boot: Fix typos in comment omap_sx1: Rename omap_mpu_state_s variable palm: Rename omap_mpu_state_s variable mainstone: Rename PXA2xxState variable spitz: Rename PXA2xxState variable tosa: Rename PXA2xxState variable z2: Rename PXA2xxState variable strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState integratorcp: Use cpu_arm_init() to obtain ARMCPU musicpal: Use cpu_arm_init() to obtain ARMCPU versatilepb: Use cpu_arm_init() to obtain ARMCPU xilinx_zynq: Use cpu_arm_init() to obtain ARMCPU arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot() arm_boot: Pass ARMCPU to arm_boot_info::secondary_cpu_reset_hook() arm_boot: Pass ARMCPU to arm_load_kernel() realview: Use cpu_arm_init() to obtain ARMCPU vexpress: Use cpu_arm_init() to obtain ARMCPU exynos4210: Use cpu_arm_init() to store ARMCPU arm_pic: Pass ARMCPU to arm_pic_init_cpu() pxa2xx: Pass ARMCPU to pxa2xx_pic_init() pxa2xx_pic: Store ARMCPU in PXA2xxPICState pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo hw/arm-misc.h | 12 ++++++------ hw/arm_boot.c | 14 ++++++++------ hw/arm_pic.c | 8 +++++--- hw/armv7m.c | 2 +- hw/collie.c | 2 +- hw/exynos4210.c | 9 +++++---- hw/exynos4210.h | 4 ++-- hw/exynos4_boards.c | 4 ++-- hw/highbank.c | 13 +++++++------ hw/integratorcp.c | 14 ++++++++------ hw/mainstone.c | 16 ++++++++-------- hw/musicpal.c | 10 +++++----- hw/nseries.c | 2 +- hw/omap1.c | 2 +- hw/omap2.c | 2 +- hw/omap_sx1.c | 6 +++--- hw/palm.c | 12 ++++++------ hw/pxa.h | 2 +- hw/pxa2xx.c | 4 ++-- hw/pxa2xx_gpio.c | 9 +++++---- hw/pxa2xx_pic.c | 32 ++++++++++++++++++-------------- hw/realview.c | 12 +++++++----- hw/spitz.c | 24 ++++++++++++------------ hw/strongarm.c | 6 +++--- hw/strongarm.h | 2 +- hw/tosa.c | 14 +++++++------- hw/versatilepb.c | 13 +++++++------ hw/vexpress.c | 18 +++++++++--------- hw/xilinx_zynq.c | 10 +++++----- hw/z2.c | 26 +++++++++++++------------- 30 files changed, 160 insertions(+), 144 deletions(-) -- 1.7.7
