[Qemu-commits] [qemu/qemu] ef0e64: ide: pass IDEState to trim AIO callback

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ef0e64a9838c0a20b5cb8a0bd2dcbcc59b0b812d
      
https://github.com/qemu/qemu/commit/ef0e64a9838c0a20b5cb8a0bd2dcbcc59b0b812d
  Author: Anton Nefedov <address@hidden>
  Date:   2018-01-19 (Fri, 19 Jan 2018)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: pass IDEState to trim AIO callback

It will be needed to handle invalid requests

Signed-off-by: Anton Nefedov <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: d8b070fed2e94b3747a74a28709d0300404c0d05
      
https://github.com/qemu/qemu/commit/d8b070fed2e94b3747a74a28709d0300404c0d05
  Author: Anton Nefedov <address@hidden>
  Date:   2018-01-19 (Fri, 19 Jan 2018)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: move ide_sect_range_ok() up

to use it without a forward declaration in the commit to follow

Signed-off-by: Anton Nefedov <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 947858b0ba97f4ec097de667e45eff99212867c3
      
https://github.com/qemu/qemu/commit/947858b0ba97f4ec097de667e45eff99212867c3
  Author: Anton Nefedov <address@hidden>
  Date:   2018-01-19 (Fri, 19 Jan 2018)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: abort TRIM operation for invalid range

ATA8-ACS3, 7.9 DATA SET MANAGEMENT - 06h, DMA

    7.9.5 Error Outputs
    If the Trim bit is set to one and:
      a) the device detects an invalid LBA Range Entry; or
      b) count is greater than IDENTIFY DEVICE data word 105
   (see 7.16.7.55),
    then the device shall return command aborted.
    A device may trim one or more LBA Range Entries before it returns
    command aborted. See table 209.

This check is not in the common ide_dma_cb() as the range for TRIM
is harder to reach: it is not in LBA/count registers and the buffer has
to be parsed first.

Signed-off-by: Anton Nefedov <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 3161906df88a471b09c38fff9a618ff83beea0c3
      
https://github.com/qemu/qemu/commit/3161906df88a471b09c38fff9a618ff83beea0c3
  Author: John Snow <address@hidden>
  Date:   2018-01-19 (Fri, 19 Jan 2018)

  Changed paths:
    M hw/ide/ahci_internal.h
    M include/hw/ide/ahci.h

  Log Message:
  -----------
  hw/ide: Remove duplicated definitions from ahci_internal.h

The same definitions can also be found in include/hw/ide/ahci.h
so let's remove these #defines from ahci_internal.h.

Signed-off-by: Thomas Huth <address@hidden>
Message-id: address@hidden
[Maintainer edit: publicize object names, privatize object macros.]
Signed-off-by: John Snow <address@hidden>


  Commit: f7c6b96c3e639e871bb929038a1b82ded7f39437
      
https://github.com/qemu/qemu/commit/f7c6b96c3e639e871bb929038a1b82ded7f39437
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-22 (Mon, 22 Jan 2018)

  Changed paths:
    M hw/ide/ahci_internal.h
    M hw/ide/core.c
    M include/hw/ide/ahci.h

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

# gpg: Signature made Fri 19 Jan 2018 22:31:27 GMT
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <address@hidden>"
# 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/ide: Remove duplicated definitions from ahci_internal.h
  ide: abort TRIM operation for invalid range
  ide: move ide_sect_range_ok() up
  ide: pass IDEState to trim AIO callback

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


Compare: https://github.com/qemu/qemu/compare/b384cd95eb9c...f7c6b96c3e63