summary refs log tree commit diff stats
path: root/hw/timer/xilinx_timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-10-01 13:13:38 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-10-01 13:13:38 +0100
commit7f21573c822805a8e6be379d9bcf3ad9effef3dc (patch)
tree3f41004aa57f38a33612594e615f9b98b1ade776 /hw/timer/xilinx_timer.c
parent2094695689f74ff6d6fb273ccecde45a1de88cc2 (diff)
parent3d5e90a50bd4ffa199166e01a365f5c5995534ae (diff)
downloadfocaccia-qemu-7f21573c822805a8e6be379d9bcf3ad9effef3dc.tar.gz
focaccia-qemu-7f21573c822805a8e6be379d9bcf3ad9effef3dc.zip
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-10-01' into staging
- Fix and re-enable the usb-hcd-ehci-test
- Silence a Coverity warning in hw/m68k/next-cube.c
- Fix crash that can occur when using bad binaries with "-kernel"
- Disallow colons in the "-accel" parameter

# gpg: Signature made Tue 01 Oct 2019 11:03:13 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-10-01:
  Disallow colons in the parameter of "-accel"
  hw/core/loader: Fix possible crash in rom_copy()
  hw/m68k/next-cube: Avoid static RTC variables and introduce control register
  tests: fix echi/ehci typo
  tests: fix usb-hcd-ehci-test compilation

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