[Qemu-commits] [qemu/qemu] a421f3: ide-test: cdrom_pio_impl fixup

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a421f3c38509ee4ce47230ec68c5c3a184efb538
      
https://github.com/qemu/qemu/commit/a421f3c38509ee4ce47230ec68c5c3a184efb538
  Author: John Snow <address@hidden>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M tests/ide-test.c

  Log Message:
  -----------
  ide-test: cdrom_pio_impl fixup

Final tidying: move the interrupt wait into the loop,
document that the status read clears the IRQ, and move
the final interrupt check outside of the loop.

This should be functionally equivalent to how it works
currently, but a little less ambiguous and slightly more
explicit about the state transitions.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 36be0929f53260cb9b1e2720c7c22f6b5fb5910f
      
https://github.com/qemu/qemu/commit/36be0929f53260cb9b1e2720c7c22f6b5fb5910f
  Author: Alberto Garcia <address@hidden>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M hw/ide/atapi.c

  Log Message:
  -----------
  atapi: Account for failed and invalid operations in cd_read_sector()

Commit 5f81724d made PIO read requests async but didn't add the
relevant block_acct_failed() and block_acct_invalid() calls.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 73a27d9ac35e3da3a2cf0ebd0bcc2be6de19dd0a
      
https://github.com/qemu/qemu/commit/73a27d9ac35e3da3a2cf0ebd0bcc2be6de19dd0a
  Author: Alberto Garcia <address@hidden>
  Date:   2015-11-24 (Tue, 24 Nov 2015)

  Changed paths:
    M hw/ide/atapi.c

  Log Message:
  -----------
  atapi: Fix code indentation

This was accidentally changed by commit 5f81724d

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 9c73517ca56d6611371376bd298b4b20f3ad6140
      
https://github.com/qemu/qemu/commit/9c73517ca56d6611371376bd298b4b20f3ad6140
  Author: John Snow <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M tests/ide-test.c

  Log Message:
  -----------
  ide-test: fix timeouts

Use explicit timeouts instead of trying to approximate it by counting
the cumulative duration of nsleep calls.

In practice, the timeout if inb() dwarfed the nsleep delays, and as a
result the real timeout value became a lot larger than 5 seconds.

So: change the semantics from "Not sooner than 5 seconds" to "no more
than 5 seconds" to ensure we don't hang the tester for very long.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden


  Commit: 7ef7ddf37674f7147ef23c311cbc3c37e908c8b0
      
https://github.com/qemu/qemu/commit/7ef7ddf37674f7147ef23c311cbc3c37e908c8b0
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M hw/ide/atapi.c
    M tests/ide-test.c

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

# gpg: Signature made Wed 25 Nov 2015 20:25:21 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <address@hidden>"

* remotes/jnsnow/tags/ide-pull-request:
  ide-test: fix timeouts
  atapi: Fix code indentation
  atapi: Account for failed and invalid operations in cd_read_sector()
  ide-test: cdrom_pio_impl fixup

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


Compare: https://github.com/qemu/qemu/compare/c7933a80bc6f...7ef7ddf37674