summary refs log tree commit diff stats
path: root/hw/timer/mss-timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-09-19 10:13:50 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-09-19 10:13:51 +0100
commit11e06ce1ed28fd0ffcbc1e2436b72f3412b4ecc8 (patch)
treecf7edbe9f677dd392047d664a1feb4a639fccd81 /hw/timer/mss-timer.c
parenta9158a5cba955b79d580a252cc58ff44d154e370 (diff)
parentae34fce5f94e93a68c879fe6179d4bcd9ee915d7 (diff)
downloadfocaccia-qemu-11e06ce1ed28fd0ffcbc1e2436b72f3412b4ecc8.tar.gz
focaccia-qemu-11e06ce1ed28fd0ffcbc1e2436b72f3412b4ecc8.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Tue 19 Sep 2017 01:10:40 BST
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  hw/block/fdc: Convert to realize
  hw/ide: Convert DeviceClass init to realize
  AHCI: remove DPRINTF macro
  AHCI: pretty-print FIS to buffer instead of stderr
  AHCI: Rework IRQ constants
  AHCI: Replace DPRINTF with trace-events
  IDE: replace DEBUG_AIO with trace events
  ATAPI: Replace DEBUG_IDE_ATAPI with tracing events
  IDE: add tracing for data ports
  IDE: Add register hints to tracing
  IDE: replace DEBUG_IDE with tracing system
  hw/ide/microdrive: Mark the dscm1xxxx device with user_creatable = false
  ide: ahci: unparent children buses before freeing their memory

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