Re: [Qemu-devel] [PATCH qom-next 00/22] ARM: QOM cpu_reset() followups

[Peter Maydell]

On 14 May 2012 18:31, Andreas Färber <address@hidden> wrote:
> 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.

Series
Acked-by: Peter Maydell <address@hidden>
(although note my remark about the Zynq board change).

You might want to look at whether the pxa2xx changes conflict with the
cp15 series I just posted. Other than not wanting to have to respin
that series, I don't much care about merge order.

thanks
-- PMM