From: Peter Maydell Date: Thu, 1 Oct 2020 18:55:10 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/ide-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b5ce42f5d138d7546f9faa2decbd6ee8702243a3;p=qemu.git Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/ide-pull-request' into staging Pull request # gpg: Signature made Thu 01 Oct 2020 18:41:05 BST # gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E # gpg: Good signature from "John Snow (John Huston) " [full] # 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/jsnow-gitlab/tags/ide-pull-request: ide: cancel pending callbacks on SRST ide: clear interrupt on command write ide: remove magic constants from the device register ide: reorder set/get sector functions ide: model HOB correctly ide: don't tamper with the device register ide: rename cmd_write to ctrl_write hw/ide/ahci: Do not dma_memory_unmap(NULL) MAINTAINERS: Update my git address Signed-off-by: Peter Maydell --- b5ce42f5d138d7546f9faa2decbd6ee8702243a3