diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-10 18:07:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-10 18:07:02 +0000 |
| commit | 98b2faeaee96ab084d0b1669918688d8895c155f (patch) | |
| tree | bb00eb6c599e5a5b74269129c1a1bdbc4b15dc34 | |
| parent | 61eedf7aec0e2395aabd628cc055096909a3ea15 (diff) | |
| parent | 98cb5dccb192b0082626080890dac413473573c6 (diff) | |
| download | qemu-98b2faeaee96ab084d0b1669918688d8895c155f.zip qemu-98b2faeaee96ab084d0b1669918688d8895c155f.tar.gz qemu-98b2faeaee96ab084d0b1669918688d8895c155f.tar.bz2 | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri 10 Feb 2017 16:47:54 GMT
# 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:
ahci: advertise HOST_CAP_64
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/ide/ahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 3c19bda..6a17acf 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -488,7 +488,7 @@ static void ahci_reg_init(AHCIState *s) s->control_regs.cap = (s->ports - 1) | (AHCI_NUM_COMMAND_SLOTS << 8) | (AHCI_SUPPORTED_SPEED_GEN1 << AHCI_SUPPORTED_SPEED) | - HOST_CAP_NCQ | HOST_CAP_AHCI; + HOST_CAP_NCQ | HOST_CAP_AHCI | HOST_CAP_64; s->control_regs.impl = (1 << s->ports) - 1; |