aboutsummaryrefslogtreecommitdiff
path: root/include/block/block_int.h
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2017-03-06 16:20:51 +0100
committerKevin Wolf <kwolf@redhat.com>2017-03-07 14:53:28 +0100
commit5fe31c25cce3b09e989e40439667cd4961aba969 (patch)
tree0b9809f4e3af0d80e817a65d0723f305dfe187ae /include/block/block_int.h
parent234ac1a9025bcfcc532449f72a97b3d4754d466c (diff)
block: Fix error handling in bdrv_replace_in_backing_chain()
When adding an Error parameter, bdrv_replace_in_backing_chain() would become nothing more than a wrapper around change_parent_backing_link(). So make the latter public, renamed as bdrv_replace_node(), and remove bdrv_replace_in_backing_chain(). Most of the callers just remove a node from the graph that they just inserted, so they can use &error_abort, but completion of a mirror job with 'replaces' set can actually fail. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'include/block/block_int.h')
-rw-r--r--include/block/block_int.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h
index fc83f7f2ce..6c699ac9c3 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -441,8 +441,8 @@ typedef struct BdrvAioNotifier {
} BdrvAioNotifier;
struct BdrvChildRole {
- /* If true, bdrv_replace_in_backing_chain() doesn't change the node this
- * BdrvChild points to. */
+ /* If true, bdrv_replace_node() doesn't change the node this BdrvChild
+ * points to. */
bool stay_at_node;
void (*inherit_options)(int *child_flags, QDict *child_options,