Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: 481cad48e5e655746893e001af31c161f4587a02 https://github.com/qemu/qemu/commit/481cad48e5e655746893e001af31c161f4587a02 Author: Manos Pitsidianakis <el13...@mail.ntua.gr> Date: 2017-10-13 (Fri, 13 Oct 2017)
Changed paths: M block/io.c M include/block/block_int.h Log Message: ----------- block: add bdrv_co_drain_end callback BlockDriverState has a bdrv_co_drain() callback but no equivalent for the end of the drain. The throttle driver (block/throttle.c) needs a way to mark the end of the drain in order to toggle io_limits_disabled correctly, thus bdrv_co_drain_end is needed. Signed-off-by: Manos Pitsidianakis <el13...@mail.ntua.gr> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> Reviewed-by: Fam Zheng <f...@redhat.com> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> Commit: f8ea8dacf0de636e2c0f13b90c0d75db97dc9b44 https://github.com/qemu/qemu/commit/f8ea8dacf0de636e2c0f13b90c0d75db97dc9b44 Author: Manos Pitsidianakis <el13...@mail.ntua.gr> Date: 2017-10-13 (Fri, 13 Oct 2017) Changed paths: M block/io.c M block/qed.c M include/block/block_int.h Log Message: ----------- block: rename bdrv_co_drain to bdrv_co_drain_begin Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> Reviewed-by: Fam Zheng <f...@redhat.com> Signed-off-by: Manos Pitsidianakis <el13...@mail.ntua.gr> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> Commit: b867eaa17b3940760f51134e409cb0580dd3dde3 https://github.com/qemu/qemu/commit/b867eaa17b3940760f51134e409cb0580dd3dde3 Author: Manos Pitsidianakis <el13...@mail.ntua.gr> Date: 2017-10-13 (Fri, 13 Oct 2017) Changed paths: M block/throttle.c Log Message: ----------- block/throttle.c: add bdrv_co_drain_begin/end callbacks Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com> Reviewed-by: Fam Zheng <f...@redhat.com> Signed-off-by: Manos Pitsidianakis <el13...@mail.ntua.gr> Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> Commit: 48ae1f60d8c9a770e6da64407984d84e25253c69 https://github.com/qemu/qemu/commit/48ae1f60d8c9a770e6da64407984d84e25253c69 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2017-10-16 (Mon, 16 Oct 2017) Changed paths: M block/io.c M block/qed.c M block/throttle.c M include/block/block_int.h Log Message: ----------- Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging # gpg: Signature made Fri 13 Oct 2017 14:49:22 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefa...@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefa...@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: block/throttle.c: add bdrv_co_drain_begin/end callbacks block: rename bdrv_co_drain to bdrv_co_drain_begin block: add bdrv_co_drain_end callback Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/78b62d376692...48ae1f60d8c9