summary refs log tree commit diff stats
path: root/qemu-timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-07-21 12:21:08 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-07-21 12:21:08 +0100
commit774ee4772b6838b78741ea52d4bf26b8922244c5 (patch)
treebb109bb8955284178806f388b14325aedacd4e23 /qemu-timer.c
parenta1bc040dabc12039944e22d9529f20d6132400dd (diff)
parent57b73090e041ece40cc619a3c43a6fafcb3dd647 (diff)
downloadfocaccia-qemu-774ee4772b6838b78741ea52d4bf26b8922244c5.tar.gz
focaccia-qemu-774ee4772b6838b78741ea52d4bf26b8922244c5.zip
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150721' into staging
target-arm queue:
 * don't sync CNTVCT with kernel all the time (fixes VM time weirdnesses)
 * fix a warning compiling disas/arm-a64 with -Wextra

# gpg: Signature made Tue Jul 21 12:15:33 2015 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"

* remotes/pmaydell/tags/pull-target-arm-20150721:
  disas/arm-a64: Add missing compiler attribute GCC_FMT_ATTR
  target-arm: kvm: Differentiate registers based on write-back levels

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-timer.c')
0 files changed, 0 insertions, 0 deletions