diff options
| author | Peter Maydell | 2015-09-03 10:50:37 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-09-03 10:50:37 +0200 |
| commit | 0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e (patch) | |
| tree | 0e00d8248d8c8e337e96b3a3499c9b11af949f9d /include | |
| parent | Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-09-01-v2-tag'... (diff) | |
| parent | block: more check for replaced node (diff) | |
| download | qemu-0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e.tar.gz qemu-0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e.tar.xz qemu-0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Wed 02 Sep 2015 17:01:33 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:
block: more check for replaced node
MAINTAINERS: add responsible person for Parallels format driver
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/block/block.h b/include/block/block.h index 37916f7208..608cd4e4fb 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -317,7 +317,8 @@ bool bdrv_recurse_is_first_non_filter(BlockDriverState *bs, bool bdrv_is_first_non_filter(BlockDriverState *candidate); /* check if a named node can be replaced when doing drive-mirror */ -BlockDriverState *check_to_replace_node(const char *node_name, Error **errp); +BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs, + const char *node_name, Error **errp); /* async block I/O */ typedef void BlockDriverDirtyHandler(BlockDriverState *bs, int64_t sector, |