Message ID | 1351586664-20525-1-git-send-email-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show |
On Tue, Oct 30, 2012 at 08:43:56AM +0000, Peter Maydell wrote: > Last arm-devs pullreq (probably) before softfreeze. Apologies to those > whose last minute patches didn't make it in but I didn't want to submit > this pullreq right on the freeze deadline, given its length. (Most of > that length is some pretty trivial patches for logging and refactoring > some init functions, though.) Please pull. > > thanks > -- PMM > > > The following changes since commit 38c4718392fda2bda1e084366b9aa41b49b9d8cf: > > Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf (2012-10-30 00:35:43 +0100) > > are available in the git repository at: > > > git://git.linaro.org/people/pmaydell/qemu-arm.git arm-devs.for-upstream > > for you to fetch changes up to 50a5be6c3d50c7684a417da4eb5f9587dace0a44: > > hw/sd.c: add SD card save/load support (2012-10-30 07:45:12 +0000) > > ---------------------------------------------------------------- > Andre Beckus (1): > hw/armv7m_nvic: Implement byte/halfword access for NVIC SCB_SHPRx registers > > Igor Mitsyanko (2): > hw/sd.c: Fix erase for high capacity cards > hw/sd.c: add SD card save/load support > > Peter Crosthwaite (4): > pflash_cfi0x: remove unused base field > pflash_cfi01: remove unused total_len field > pflash_cfi0x: QOMified > pflash_cfi01: Fix debug mode printfery > > Peter Maydell (21): > hw/vexpress.c: Don't prematurely explode QEMUMachineInitArgs > hw/realview.c: Don't prematurely explode QEMUMachineInitArgs > hw/versatilepb: Don't prematurely explode QEMUMachineInitArgs > hw/spitz: Don't prematurely explode QEMUMachineInitArgs > hw/omap_sx1: Don't prematurely explode QEMUMachineInitArgs > hw/nseries: Don't prematurely explode QEMUMachineInitArgs > hw/mainstone: Don't prematurely explode QEMUMachineInitArgs > hw/exynos4_boards: Don't prematurely explode QEMUMachineInitArgs > hw/pl050: Use LOG_GUEST_ERROR > hw/pl061: Use LOG_GUEST_ERROR > hw/pl080: Use LOG_GUEST_ERROR and LOG_UNIMP > hw/pl110: Use LOG_GUEST_ERROR rather than hw_error() > hw/pl190: Use LOG_UNIMP rather than hw_error() > hw/arm11mpcore: Use LOG_GUEST_ERROR rather than hw_error() > hw/arm_gic: Use LOG_GUEST_ERROR > hw/arm_timer: Use LOG_GUEST_ERROR and LOG_UNIMP > hw/armv7m_nvic: Use LOG_GUEST_ERROR and LOG_UNIMP > hw/arm_sysctl: Use LOG_GUEST_ERROR > hw/arm_l2x0: Use LOG_GUEST_ERROR > hw/versatile_i2c: Use LOG_GUEST_ERROR > vmstate: Add support for saving/loading bitmaps > > hw/arm11mpcore.c | 7 ++- > hw/arm_gic.c | 12 ++-- > hw/arm_l2x0.c | 6 +- > hw/arm_sysctl.c | 8 ++- > hw/arm_timer.c | 19 ++++-- > hw/armv7m_nvic.c | 87 ++++++++++++++------------- > hw/exynos4_boards.c | 32 ++++------ > hw/mainstone.c | 21 +++---- > hw/nseries.c | 39 ++++--------- > hw/omap_sx1.c | 36 +++--------- > hw/pflash_cfi01.c | 148 +++++++++++++++++++++++++++++++--------------- > hw/pflash_cfi02.c | 162 ++++++++++++++++++++++++++++++++++++--------------- > hw/pl050.c | 6 +- > hw/pl061.c | 6 +- > hw/pl080.c | 11 ++-- > hw/pl110.c | 6 +- > hw/pl190.c | 2 +- > hw/realview.c | 68 ++++++--------------- > hw/sd.c | 106 ++++++++++++++++++++++++--------- > hw/sd.h | 1 + > hw/spitz.c | 45 ++++---------- > hw/versatile_i2c.c | 6 +- > hw/versatilepb.c | 44 ++++---------- > hw/vexpress.c | 38 +++--------- > savevm.c | 41 +++++++++++++ > vmstate.h | 13 +++++ > 26 files changed, 541 insertions(+), 429 deletions(-) > Thanks, pulled.