[Qemu-commits] [qemu/qemu] a71264: sheepdog: remove unused cancellation support

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a71264f9f5068213f5757133bba028ae1f37d460
      
https://github.com/qemu/qemu/commit/a71264f9f5068213f5757133bba028ae1f37d460
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: remove unused cancellation support

SheepdogAIOCB is internal to sheepdog.c, hence it is never canceled.

Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: e80ab33dc0f9b87542b7aa1088d2e1e3968ed516
      
https://github.com/qemu/qemu/commit/e80ab33dc0f9b87542b7aa1088d2e1e3968ed516
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: reorganize coroutine flow

Delimit co_recv's lifetime clearly in aio_read_response.

Do a simple qemu_coroutine_enter in aio_read_response, letting
sd_co_writev call sd_write_done.

Handle nr_pending in the same way in sd_co_rw_vector,
sd_write_done and sd_co_flush_to_disk.

Remove sd_co_rw_vector's return value; just leave with no
pending requests.

[Jeff: added missing 'return' back, spotted by Paolo after
       series was applied.]

Signed-off-by: Jeff Cody <address@hidden>


  Commit: 28ddd08cd68029933e6a61b7f6d2af88a7c1d344
      
https://github.com/qemu/qemu/commit/28ddd08cd68029933e6a61b7f6d2af88a7c1d344
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: do not use BlockAIOCB

Sheepdog's AIOCB are completely internal entities for a group of
requests and do not need dynamic allocation.

Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: c4080e939153adf19cb3d856d16fca11d89ba9c9
      
https://github.com/qemu/qemu/commit/c4080e939153adf19cb3d856d16fca11d89ba9c9
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: simplify inflight_aio_head management

Add to the list in add_aio_request and, indirectly, resend_aioreq.  Inline
free_aio_req in the caller, it does not simply undo alloc_aio_req's job.

Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: acf6e5f0962c4be670d4a93ede77423512521876
      
https://github.com/qemu/qemu/commit/acf6e5f0962c4be670d4a93ede77423512521876
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: reorganize check for overlapping requests

Wrap the code that was copied repeatedly in the two functions,
sd_aio_setup and sd_aio_complete.

Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 53761caf179013650c18d2a8285e7f0548254e78
      
https://github.com/qemu/qemu/commit/53761caf179013650c18d2a8285e7f0548254e78
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
    M block/sheepdog.c

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

# gpg: Signature made Wed 01 Feb 2017 05:32:23 GMT
# gpg:                using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  sheepdog: reorganize check for overlapping requests
  sheepdog: simplify inflight_aio_head management
  sheepdog: do not use BlockAIOCB
  sheepdog: reorganize coroutine flow
  sheepdog: remove unused cancellation support

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


Compare: https://github.com/qemu/qemu/compare/e905587b752a...53761caf1790