From: Peter Maydell Date: Tue, 19 Sep 2017 09:13:50 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging X-Git-Tag: qemu-xen-4.11.0-rc1~166 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=11e06ce1ed28fd0ffcbc1e2436b72f3412b4ecc8;p=qemu-xen.git 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) " # 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 --- 11e06ce1ed28fd0ffcbc1e2436b72f3412b4ecc8