diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-08 19:44:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-08 19:44:28 +0100 |
| commit | c8e84287da7dd6a46c0bb0e53190e79ba4eedf24 (patch) | |
| tree | 2e5d2db6fa9dfd0b1fa2c995b5a43c6a666aebf5 /hw | |
| parent | d09952ee8caeea928695d5a3dc3ec50d8afb98c6 (diff) | |
| parent | 702c8c8be2f3317c81fff83f82d8a5f1d50d41b8 (diff) | |
| download | hqemu-c8e84287da7dd6a46c0bb0e53190e79ba4eedf24.zip hqemu-c8e84287da7dd6a46c0bb0e53190e79ba4eedf24.tar.gz | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Wed Jul 8 19:08:28 2015 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# 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:
ahci: Fix CD-ROM signature
libqos/ahci: fix ahci_write_fis for ncq on ppc64
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/ahci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index 9f5b4d2..68d5074 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -166,7 +166,7 @@ #define AHCI_CMD_HDR_CMD_FIS_LEN 0x1f #define AHCI_CMD_HDR_PRDT_LEN 16 -#define SATA_SIGNATURE_CDROM 0xeb140000 +#define SATA_SIGNATURE_CDROM 0xeb140101 #define SATA_SIGNATURE_DISK 0x00000101 #define AHCI_GENERIC_HOST_CONTROL_REGS_MAX_ADDR 0x20 |
