Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160714' into staging
target-arm queue: * add virtio-mmio transport base address to device path (avoid an assertion failure with multiple virtio-scsi-devices) * revert hw/ptimer commit 5a50307b which causes regressions on SPARC guests * use Neon to accelerate zero-page checking on AArch64 hosts * set the MPIDR for TCG to match how KVM does it (and fit with GICv2/GICv3 restrictions on SGI target lists) * add some missing AArch32 TLBI hypervisor TLB operations * m25p80: Fix QIOR/DIOR handling for Winbond * hw/misc: fix typo in Aspeed SCU hw-strap2 property name * ast2400: pretend DMAs are done for U-boot * ast2400: some minor code cleanups # gpg: Signature made Thu 14 Jul 2016 17:21:30 BST # gpg: using RSA key 0x3C2525ED14360CDE # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" # gpg: aka "Peter Maydell <pmaydell@gmail.com>" # gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE * remotes/pmaydell/tags/pull-target-arm-20160714: ast2400: externalize revision numbers ast2400: pretend DMAs are done for U-boot ast2400: replace aspeed_smc_is_implemented() hw/misc: fix typo in Aspeed SCU hw-strap2 property name m25p80: Fix QIOR/DIOR handling for Winbond target-arm: Add missed AArch32 TLBI sytem registers hw/arm/virt: tcg: adjust MPIDR like KVM gic: provide defines for v2/v3 targetlist sizes target-arm: Use Neon for zero checking Revert "hw/ptimer: Perform counter wrap around if timer already expired" virtio-mmio: format transport base address in BusClass.get_dev_path Signed-off-by:Peter Maydell <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- hw/arm/ast2400.c 0 additions, 2 deletionshw/arm/ast2400.c
- hw/arm/virt.c 24 additions, 1 deletionhw/arm/virt.c
- hw/block/m25p80.c 4 additions, 2 deletionshw/block/m25p80.c
- hw/core/ptimer.c 2 additions, 7 deletionshw/core/ptimer.c
- hw/misc/aspeed_scu.c 2 additions, 4 deletionshw/misc/aspeed_scu.c
- hw/ssi/aspeed_smc.c 19 additions, 20 deletionshw/ssi/aspeed_smc.c
- hw/virtio/virtio-mmio.c 49 additions, 0 deletionshw/virtio/virtio-mmio.c
- include/hw/compat.h 5 additions, 1 deletioninclude/hw/compat.h
- include/hw/intc/arm_gic.h 3 additions, 0 deletionsinclude/hw/intc/arm_gic.h
- include/hw/intc/arm_gicv3_common.h 3 additions, 0 deletionsinclude/hw/intc/arm_gicv3_common.h
- include/hw/misc/aspeed_scu.h 5 additions, 0 deletionsinclude/hw/misc/aspeed_scu.h
- target-arm/helper.c 139 additions, 0 deletionstarget-arm/helper.c
- util/cutils.c 7 additions, 0 deletionsutil/cutils.c
Loading
Please register or sign in to comment