diff options
| author | Peter Maydell | 2017-08-23 18:38:01 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-23 18:38:01 +0200 |
| commit | 1eed33994e28d4a0437ba6e944bbc3ec5e4a29a0 (patch) | |
| tree | cacbb56b00763fc9e0956df21ca11d742a77aa14 /include | |
| parent | numa: Move numa_legacy_auto_assign_ram to pc-i440fx-2.9 (diff) | |
| parent | nbd-client: avoid spurious qio_channel_yield() re-entry (diff) | |
| download | qemu-1eed33994e28d4a0437ba6e944bbc3ec5e4a29a0.tar.gz qemu-1eed33994e28d4a0437ba6e944bbc3ec5e4a29a0.tar.xz qemu-1eed33994e28d4a0437ba6e944bbc3ec5e4a29a0.zip | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-08-23' into staging
nbd patches for 2017-08-23
- Fam Zheng: 0/4 block: Fix non-shared storage migration
- Stefan Hajnoczi: qemu-iotests: add 194 non-shared storage migration test
- Stefan Hajnoczi: nbd-client: avoid spurious qio_channel_yield() re-entry
# gpg: Signature made Wed 23 Aug 2017 17:22:53 BST
# gpg: using RSA key 0xA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg: aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-nbd-2017-08-23:
nbd-client: avoid spurious qio_channel_yield() re-entry
qemu-iotests: add 194 non-shared storage migration test
block: Update open_flags after ->inactivate() callback
mirror: Mark target BB as "force allow inactivate"
block-backend: Allow more "can inactivate" cases
block-backend: Refactor inactivate check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/block-backend.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 4a3730596b..aadc733daf 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -241,5 +241,6 @@ void blk_set_io_limits(BlockBackend *blk, ThrottleConfig *cfg); void blk_io_limits_disable(BlockBackend *blk); void blk_io_limits_enable(BlockBackend *blk, const char *group); void blk_io_limits_update_group(BlockBackend *blk, const char *group); +void blk_set_force_allow_inactivate(BlockBackend *blk); #endif |