[Qemu-commits] [qemu/qemu] 0e826a: macio: re-add TRIM support

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0e826a061a3e8e8485488a7da02cc139fc07d620
      
https://github.com/qemu/qemu/commit/0e826a061a3e8e8485488a7da02cc139fc07d620
  Author: Aurelien Jarno <address@hidden>
  Date:   2015-07-31 (Fri, 31 Jul 2015)

  Changed paths:
    M hw/ide/macio.c

  Log Message:
  -----------
  macio: re-add TRIM support

Commit bd4214fc dropped TRIM support by mistake. Given it is still
advertised to the host when using a drive with discard=on, this cause
the IDE bus to hang when the host issues a TRIM command.

This patch fixes that by re-adding the TRIM code, ported to the new
new DMA implementation.

Cc: Mark Cave-Ayland <address@hidden>
Cc: John Snow <address@hidden>
Signed-off-by: Aurelien Jarno <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 91ced514461e1a533bfb9e2eea32bd7df678b1cd
      
https://github.com/qemu/qemu/commit/91ced514461e1a533bfb9e2eea32bd7df678b1cd
  Author: John Snow <address@hidden>
  Date:   2015-07-31 (Fri, 31 Jul 2015)

  Changed paths:
    M hw/ide/ahci.h

  Log Message:
  -----------
  ahci: fix ICC mask definition

There are likely others that could be updated, but we'll
go with a light touch for 2.4 for now.

Without the Unsigned specifier, this shifts bits into the
signed bit, which makes clang unhappy and could cause
unwanted behavior.

Reported-by: Peter Maydell <address@hidden>
Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden


  Commit: ff90f84e74d7c8641a493585ba9ea8d6e0d19855
      
https://github.com/qemu/qemu/commit/ff90f84e74d7c8641a493585ba9ea8d6e0d19855
  Author: Peter Maydell <address@hidden>
  Date:   2015-08-03 (Mon, 03 Aug 2015)

  Changed paths:
    M hw/ide/ahci.h
    M hw/ide/macio.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into 
staging

# gpg: Signature made Fri Jul 31 23:24:06 2015 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <address@hidden>"
# 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 ICC mask definition
  macio: re-add TRIM support

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/cb48f67ad8c7...ff90f84e74d7