Merge remote-tracking branch 'qemu/master'
commit99a34dc4d2e6fcad151d7e9a74f5a56a63fa04f7
authorStefan Weil <sw@weilnetz.de>
Sat, 19 May 2018 17:34:32 +0000 (19 19:34 +0200)
committerStefan Weil <sw@weilnetz.de>
Sat, 19 May 2018 18:17:15 +0000 (19 20:17 +0200)
treeac46176599dc5e64501b379977f230af1c554be9
parentbceb84ebf934e791c67810da618f9f3d44b07ddf
parent5bcf917ee37a5efbef99f091a96db54a5276becb
Merge remote-tracking branch 'qemu/master'

This required changes for the KiB / MiB macros.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
12 files changed:
hw/arm/arm_tt.c
hw/arm/bast.c
hw/arm/xlnx-zynqmp.c
hw/mips/ar7.c
include/qemu-common.h
include/qom/cpu.h
target/arm/cpu.c
target/arm/cpu.h
target/arm/helper.c
target/i386/cpu.h
target/mips/op_helper.c
ui/console.c