[Qemu-commits] [qemu/qemu] e321c0: block: for jobs, do not clear user_paused until af...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e321c0597c7590499bacab239d7f86e257f96bcd
      
https://github.com/qemu/qemu/commit/e321c0597c7590499bacab239d7f86e257f96bcd
  Author: Jeff Cody <address@hidden>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    M job.c

  Log Message:
  -----------
  block: for jobs, do not clear user_paused until after the resume

The function job_cancel_async() will always cause an assert for blockjob
user resume.  We set job->user_paused to false, and then call
job->driver->user_resume().  In the case of blockjobs, this is the
block_job_user_resume() function.

In that function, we assert that job.user_paused is set to true.
Unfortunately, right before calling this function, it has explicitly
been set to false.

The fix is pretty simple: set job->user_paused to false only after the
job user_resume() function has been called.

Reviewed-by: John Snow <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 26bf474ba92c76e61bea51726e22da6dfd185296
      
https://github.com/qemu/qemu/commit/26bf474ba92c76e61bea51726e22da6dfd185296
  Author: Jeff Cody <address@hidden>
  Date:   2018-08-21 (Tue, 21 Aug 2018)

  Changed paths:
    A tests/qemu-iotests/229
    A tests/qemu-iotests/229.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  block: iotest to catch abort on forced blockjob cancel

Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 5ccac548faf041ff5229a8e8342e3be14a34c8af
      
https://github.com/qemu/qemu/commit/5ccac548faf041ff5229a8e8342e3be14a34c8af
  Author: Peter Maydell <address@hidden>
  Date:   2018-08-23 (Thu, 23 Aug 2018)

  Changed paths:
    M job.c
    A tests/qemu-iotests/229
    A tests/qemu-iotests/229.out
    M tests/qemu-iotests/group

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

# gpg: Signature made Wed 22 Aug 2018 04:40:38 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# 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:
  block: iotest to catch abort on forced blockjob cancel
  block: for jobs, do not clear user_paused until after the resume

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


Compare: https://github.com/qemu/qemu/compare/3392fbee4e43...5ccac548faf0
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.