Skip to content
  • Peter Maydell's avatar
    8aeaa055
    Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · 8aeaa055
    Peter Maydell authored
    
    
    # gpg: Signature made Fri Jun 12 15:57:47 2015 BST using RSA key ID 81AB73C8
    # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
    # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
    
    * remotes/stefanha/tags/block-pull-request:
      qemu-iotests: expand test 093 to support group throttling
      throttle: Update throttle infrastructure copyright
      throttle: add the name of the ThrottleGroup to BlockDeviceInfo
      throttle: acquire the ThrottleGroup lock in bdrv_swap()
      throttle: Add throttle group support
      throttle: Add throttle group infrastructure tests
      throttle: Add throttle group infrastructure
      throttle: Extract timers from ThrottleState into a separate structure
      raw-posix: Fix .bdrv_co_get_block_status() for unaligned image size
      Revert "iothread: release iothread around aio_poll"
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    8aeaa055
    Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
    Peter Maydell authored
    
    
    # gpg: Signature made Fri Jun 12 15:57:47 2015 BST using RSA key ID 81AB73C8
    # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
    # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
    
    * remotes/stefanha/tags/block-pull-request:
      qemu-iotests: expand test 093 to support group throttling
      throttle: Update throttle infrastructure copyright
      throttle: add the name of the ThrottleGroup to BlockDeviceInfo
      throttle: acquire the ThrottleGroup lock in bdrv_swap()
      throttle: Add throttle group support
      throttle: Add throttle group infrastructure tests
      throttle: Add throttle group infrastructure
      throttle: Extract timers from ThrottleState into a separate structure
      raw-posix: Fix .bdrv_co_get_block_status() for unaligned image size
      Revert "iothread: release iothread around aio_poll"
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Loading