yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-block-ignore_bds_parents-parameter-for-drain-functio.patch

26ba25
From b4a41557a3fd97307e750c84916f9d2237f08242 Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Wed, 10 Oct 2018 20:21:47 +0100
26ba25
Subject: [PATCH 21/49] block: ignore_bds_parents parameter for drain functions
26ba25
MIME-Version: 1.0
26ba25
Content-Type: text/plain; charset=UTF-8
26ba25
Content-Transfer-Encoding: 8bit
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20181010202213.7372-9-kwolf@redhat.com>
26ba25
Patchwork-id: 82598
26ba25
O-Subject: [RHEL-8 qemu-kvm PATCH 18/44] block: ignore_bds_parents parameter for drain functions
26ba25
Bugzilla: 1637976
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: John Snow <jsnow@redhat.com>
26ba25
RH-Acked-by: Thomas Huth <thuth@redhat.com>
26ba25
26ba25
In the future, bdrv_drained_all_begin/end() will drain all invidiual
26ba25
nodes separately rather than whole subtrees. This means that we don't
26ba25
want to propagate the drain to all parents any more: If the parent is a
26ba25
BDS, it will already be drained separately. Recursing to all parents is
26ba25
unnecessary work and would make it an O(n²) operation.
26ba25
26ba25
Prepare the drain function for the changed drain_all by adding an
26ba25
ignore_bds_parents parameter to the internal implementation that
26ba25
prevents the propagation of the drain to BDS parents. We still (have to)
26ba25
propagate it to non-BDS parents like BlockBackends or Jobs because those
26ba25
are not drained separately.
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
(cherry picked from commit 6cd5c9d7b2df93ef54144f170d4c908934a4767f)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 block.c                   | 11 +++---
26ba25
 block/io.c                | 88 ++++++++++++++++++++++++++++-------------------
26ba25
 block/vvfat.c             |  1 +
26ba25
 include/block/block.h     | 16 ++++++---
26ba25
 include/block/block_int.h |  6 ++++
26ba25
 5 files changed, 78 insertions(+), 44 deletions(-)
26ba25
26ba25
diff --git a/block.c b/block.c
26ba25
index 5a50de6..519be6e 100644
26ba25
--- a/block.c
26ba25
+++ b/block.c
26ba25
@@ -818,13 +818,13 @@ static char *bdrv_child_get_parent_desc(BdrvChild *c)
26ba25
 static void bdrv_child_cb_drained_begin(BdrvChild *child)
26ba25
 {
26ba25
     BlockDriverState *bs = child->opaque;
26ba25
-    bdrv_do_drained_begin_quiesce(bs, NULL);
26ba25
+    bdrv_do_drained_begin_quiesce(bs, NULL, false);
26ba25
 }
26ba25
 
26ba25
 static bool bdrv_child_cb_drained_poll(BdrvChild *child)
26ba25
 {
26ba25
     BlockDriverState *bs = child->opaque;
26ba25
-    return bdrv_drain_poll(bs, false, NULL);
26ba25
+    return bdrv_drain_poll(bs, false, NULL, false);
26ba25
 }
26ba25
 
26ba25
 static void bdrv_child_cb_drained_end(BdrvChild *child)
26ba25
@@ -908,6 +908,7 @@ static void bdrv_inherited_options(int *child_flags, QDict *child_options,
26ba25
 }
26ba25
 
26ba25
 const BdrvChildRole child_file = {
26ba25
+    .parent_is_bds   = true,
26ba25
     .get_parent_desc = bdrv_child_get_parent_desc,
26ba25
     .inherit_options = bdrv_inherited_options,
26ba25
     .drained_begin   = bdrv_child_cb_drained_begin,
26ba25
@@ -933,6 +934,7 @@ static void bdrv_inherited_fmt_options(int *child_flags, QDict *child_options,
26ba25
 }
26ba25
 
26ba25
 const BdrvChildRole child_format = {
26ba25
+    .parent_is_bds   = true,
26ba25
     .get_parent_desc = bdrv_child_get_parent_desc,
26ba25
     .inherit_options = bdrv_inherited_fmt_options,
26ba25
     .drained_begin   = bdrv_child_cb_drained_begin,
26ba25
@@ -1051,6 +1053,7 @@ static int bdrv_backing_update_filename(BdrvChild *c, BlockDriverState *base,
26ba25
 }
26ba25
 
26ba25
 const BdrvChildRole child_backing = {
26ba25
+    .parent_is_bds   = true,
26ba25
     .get_parent_desc = bdrv_child_get_parent_desc,
26ba25
     .attach          = bdrv_backing_attach,
26ba25
     .detach          = bdrv_backing_detach,
26ba25
@@ -4901,7 +4904,7 @@ void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context)
26ba25
     AioContext *ctx = bdrv_get_aio_context(bs);
26ba25
 
26ba25
     aio_disable_external(ctx);
26ba25
-    bdrv_parent_drained_begin(bs, NULL);
26ba25
+    bdrv_parent_drained_begin(bs, NULL, false);
26ba25
     bdrv_drain(bs); /* ensure there are no in-flight requests */
26ba25
 
26ba25
     while (aio_poll(ctx, false)) {
26ba25
@@ -4915,7 +4918,7 @@ void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context)
26ba25
      */
26ba25
     aio_context_acquire(new_context);
26ba25
     bdrv_attach_aio_context(bs, new_context);
26ba25
-    bdrv_parent_drained_end(bs, NULL);
26ba25
+    bdrv_parent_drained_end(bs, NULL, false);
26ba25
     aio_enable_external(ctx);
26ba25
     aio_context_release(new_context);
26ba25
 }
26ba25
diff --git a/block/io.c b/block/io.c
26ba25
index b58c91b..0021fefd 100644
26ba25
--- a/block/io.c
26ba25
+++ b/block/io.c
26ba25
@@ -41,12 +41,13 @@
26ba25
 static int coroutine_fn bdrv_co_do_pwrite_zeroes(BlockDriverState *bs,
26ba25
     int64_t offset, int bytes, BdrvRequestFlags flags);
26ba25
 
26ba25
-void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore)
26ba25
+void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore,
26ba25
+                               bool ignore_bds_parents)
26ba25
 {
26ba25
     BdrvChild *c, *next;
26ba25
 
26ba25
     QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) {
26ba25
-        if (c == ignore) {
26ba25
+        if (c == ignore || (ignore_bds_parents && c->role->parent_is_bds)) {
26ba25
             continue;
26ba25
         }
26ba25
         if (c->role->drained_begin) {
26ba25
@@ -55,12 +56,13 @@ void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore)
26ba25
     }
26ba25
 }
26ba25
 
26ba25
-void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore)
26ba25
+void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore,
26ba25
+                             bool ignore_bds_parents)
26ba25
 {
26ba25
     BdrvChild *c, *next;
26ba25
 
26ba25
     QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) {
26ba25
-        if (c == ignore) {
26ba25
+        if (c == ignore || (ignore_bds_parents && c->role->parent_is_bds)) {
26ba25
             continue;
26ba25
         }
26ba25
         if (c->role->drained_end) {
26ba25
@@ -69,13 +71,14 @@ void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore)
26ba25
     }
26ba25
 }
26ba25
 
26ba25
-static bool bdrv_parent_drained_poll(BlockDriverState *bs, BdrvChild *ignore)
26ba25
+static bool bdrv_parent_drained_poll(BlockDriverState *bs, BdrvChild *ignore,
26ba25
+                                     bool ignore_bds_parents)
26ba25
 {
26ba25
     BdrvChild *c, *next;
26ba25
     bool busy = false;
26ba25
 
26ba25
     QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) {
26ba25
-        if (c == ignore) {
26ba25
+        if (c == ignore || (ignore_bds_parents && c->role->parent_is_bds)) {
26ba25
             continue;
26ba25
         }
26ba25
         if (c->role->drained_poll) {
26ba25
@@ -166,6 +169,7 @@ typedef struct {
26ba25
     bool recursive;
26ba25
     bool poll;
26ba25
     BdrvChild *parent;
26ba25
+    bool ignore_bds_parents;
26ba25
 } BdrvCoDrainData;
26ba25
 
26ba25
 static void coroutine_fn bdrv_drain_invoke_entry(void *opaque)
26ba25
@@ -219,11 +223,11 @@ static void bdrv_drain_invoke(BlockDriverState *bs, bool begin)
26ba25
 
26ba25
 /* Returns true if BDRV_POLL_WHILE() should go into a blocking aio_poll() */
26ba25
 bool bdrv_drain_poll(BlockDriverState *bs, bool recursive,
26ba25
-                     BdrvChild *ignore_parent)
26ba25
+                     BdrvChild *ignore_parent, bool ignore_bds_parents)
26ba25
 {
26ba25
     BdrvChild *child, *next;
26ba25
 
26ba25
-    if (bdrv_parent_drained_poll(bs, ignore_parent)) {
26ba25
+    if (bdrv_parent_drained_poll(bs, ignore_parent, ignore_bds_parents)) {
26ba25
         return true;
26ba25
     }
26ba25
 
26ba25
@@ -232,8 +236,9 @@ bool bdrv_drain_poll(BlockDriverState *bs, bool recursive,
26ba25
     }
26ba25
 
26ba25
     if (recursive) {
26ba25
+        assert(!ignore_bds_parents);
26ba25
         QLIST_FOREACH_SAFE(child, &bs->children, next, next) {
26ba25
-            if (bdrv_drain_poll(child->bs, recursive, child)) {
26ba25
+            if (bdrv_drain_poll(child->bs, recursive, child, false)) {
26ba25
                 return true;
26ba25
             }
26ba25
         }
26ba25
@@ -249,13 +254,14 @@ static bool bdrv_drain_poll_top_level(BlockDriverState *bs, bool recursive,
26ba25
      * have executed. */
26ba25
     while (aio_poll(bs->aio_context, false));
26ba25
 
26ba25
-    return bdrv_drain_poll(bs, recursive, ignore_parent);
26ba25
+    return bdrv_drain_poll(bs, recursive, ignore_parent, false);
26ba25
 }
26ba25
 
26ba25
 static void bdrv_do_drained_begin(BlockDriverState *bs, bool recursive,
26ba25
-                                  BdrvChild *parent, bool poll);
26ba25
+                                  BdrvChild *parent, bool ignore_bds_parents,
26ba25
+                                  bool poll);
26ba25
 static void bdrv_do_drained_end(BlockDriverState *bs, bool recursive,
26ba25
-                                BdrvChild *parent);
26ba25
+                                BdrvChild *parent, bool ignore_bds_parents);
26ba25
 
26ba25
 static void bdrv_co_drain_bh_cb(void *opaque)
26ba25
 {
26ba25
@@ -266,9 +272,11 @@ static void bdrv_co_drain_bh_cb(void *opaque)
26ba25
     if (bs) {
26ba25
         bdrv_dec_in_flight(bs);
26ba25
         if (data->begin) {
26ba25
-            bdrv_do_drained_begin(bs, data->recursive, data->parent, data->poll);
26ba25
+            bdrv_do_drained_begin(bs, data->recursive, data->parent,
26ba25
+                                  data->ignore_bds_parents, data->poll);
26ba25
         } else {
26ba25
-            bdrv_do_drained_end(bs, data->recursive, data->parent);
26ba25
+            bdrv_do_drained_end(bs, data->recursive, data->parent,
26ba25
+                                data->ignore_bds_parents);
26ba25
         }
26ba25
     } else {
26ba25
         assert(data->begin);
26ba25
@@ -281,7 +289,9 @@ static void bdrv_co_drain_bh_cb(void *opaque)
26ba25
 
26ba25
 static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,
26ba25
                                                 bool begin, bool recursive,
26ba25
-                                                BdrvChild *parent, bool poll)
26ba25
+                                                BdrvChild *parent,
26ba25
+                                                bool ignore_bds_parents,
26ba25
+                                                bool poll)
26ba25
 {
26ba25
     BdrvCoDrainData data;
26ba25
 
26ba25
@@ -296,6 +306,7 @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,
26ba25
         .begin = begin,
26ba25
         .recursive = recursive,
26ba25
         .parent = parent,
26ba25
+        .ignore_bds_parents = ignore_bds_parents,
26ba25
         .poll = poll,
26ba25
     };
26ba25
     if (bs) {
26ba25
@@ -311,7 +322,7 @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,
26ba25
 }
26ba25
 
26ba25
 void bdrv_do_drained_begin_quiesce(BlockDriverState *bs,
26ba25
-                                   BdrvChild *parent)
26ba25
+                                   BdrvChild *parent, bool ignore_bds_parents)
26ba25
 {
26ba25
     assert(!qemu_in_coroutine());
26ba25
 
26ba25
@@ -320,26 +331,30 @@ void bdrv_do_drained_begin_quiesce(BlockDriverState *bs,
26ba25
         aio_disable_external(bdrv_get_aio_context(bs));
26ba25
     }
26ba25
 
26ba25
-    bdrv_parent_drained_begin(bs, parent);
26ba25
+    bdrv_parent_drained_begin(bs, parent, ignore_bds_parents);
26ba25
     bdrv_drain_invoke(bs, true);
26ba25
 }
26ba25
 
26ba25
 static void bdrv_do_drained_begin(BlockDriverState *bs, bool recursive,
26ba25
-                                  BdrvChild *parent, bool poll)
26ba25
+                                  BdrvChild *parent, bool ignore_bds_parents,
26ba25
+                                  bool poll)
26ba25
 {
26ba25
     BdrvChild *child, *next;
26ba25
 
26ba25
     if (qemu_in_coroutine()) {
26ba25
-        bdrv_co_yield_to_drain(bs, true, recursive, parent, poll);
26ba25
+        bdrv_co_yield_to_drain(bs, true, recursive, parent, ignore_bds_parents,
26ba25
+                               poll);
26ba25
         return;
26ba25
     }
26ba25
 
26ba25
-    bdrv_do_drained_begin_quiesce(bs, parent);
26ba25
+    bdrv_do_drained_begin_quiesce(bs, parent, ignore_bds_parents);
26ba25
 
26ba25
     if (recursive) {
26ba25
+        assert(!ignore_bds_parents);
26ba25
         bs->recursive_quiesce_counter++;
26ba25
         QLIST_FOREACH_SAFE(child, &bs->children, next, next) {
26ba25
-            bdrv_do_drained_begin(child->bs, true, child, false);
26ba25
+            bdrv_do_drained_begin(child->bs, true, child, ignore_bds_parents,
26ba25
+                                  false);
26ba25
         }
26ba25
     }
26ba25
 
26ba25
@@ -353,28 +368,30 @@ static void bdrv_do_drained_begin(BlockDriverState *bs, bool recursive,
26ba25
      * nodes.
26ba25
      */
26ba25
     if (poll) {
26ba25
+        assert(!ignore_bds_parents);
26ba25
         BDRV_POLL_WHILE(bs, bdrv_drain_poll_top_level(bs, recursive, parent));
26ba25
     }
26ba25
 }
26ba25
 
26ba25
 void bdrv_drained_begin(BlockDriverState *bs)
26ba25
 {
26ba25
-    bdrv_do_drained_begin(bs, false, NULL, true);
26ba25
+    bdrv_do_drained_begin(bs, false, NULL, false, true);
26ba25
 }
26ba25
 
26ba25
 void bdrv_subtree_drained_begin(BlockDriverState *bs)
26ba25
 {
26ba25
-    bdrv_do_drained_begin(bs, true, NULL, true);
26ba25
+    bdrv_do_drained_begin(bs, true, NULL, false, true);
26ba25
 }
26ba25
 
26ba25
-void bdrv_do_drained_end(BlockDriverState *bs, bool recursive,
26ba25
-                         BdrvChild *parent)
26ba25
+static void bdrv_do_drained_end(BlockDriverState *bs, bool recursive,
26ba25
+                                BdrvChild *parent, bool ignore_bds_parents)
26ba25
 {
26ba25
     BdrvChild *child, *next;
26ba25
     int old_quiesce_counter;
26ba25
 
26ba25
     if (qemu_in_coroutine()) {
26ba25
-        bdrv_co_yield_to_drain(bs, false, recursive, parent, false);
26ba25
+        bdrv_co_yield_to_drain(bs, false, recursive, parent, ignore_bds_parents,
26ba25
+                               false);
26ba25
         return;
26ba25
     }
26ba25
     assert(bs->quiesce_counter > 0);
26ba25
@@ -382,27 +399,28 @@ void bdrv_do_drained_end(BlockDriverState *bs, bool recursive,
26ba25
 
26ba25
     /* Re-enable things in child-to-parent order */
26ba25
     bdrv_drain_invoke(bs, false);
26ba25
-    bdrv_parent_drained_end(bs, parent);
26ba25
+    bdrv_parent_drained_end(bs, parent, ignore_bds_parents);
26ba25
     if (old_quiesce_counter == 1) {
26ba25
         aio_enable_external(bdrv_get_aio_context(bs));
26ba25
     }
26ba25
 
26ba25
     if (recursive) {
26ba25
+        assert(!ignore_bds_parents);
26ba25
         bs->recursive_quiesce_counter--;
26ba25
         QLIST_FOREACH_SAFE(child, &bs->children, next, next) {
26ba25
-            bdrv_do_drained_end(child->bs, true, child);
26ba25
+            bdrv_do_drained_end(child->bs, true, child, ignore_bds_parents);
26ba25
         }
26ba25
     }
26ba25
 }
26ba25
 
26ba25
 void bdrv_drained_end(BlockDriverState *bs)
26ba25
 {
26ba25
-    bdrv_do_drained_end(bs, false, NULL);
26ba25
+    bdrv_do_drained_end(bs, false, NULL, false);
26ba25
 }
26ba25
 
26ba25
 void bdrv_subtree_drained_end(BlockDriverState *bs)
26ba25
 {
26ba25
-    bdrv_do_drained_end(bs, true, NULL);
26ba25
+    bdrv_do_drained_end(bs, true, NULL, false);
26ba25
 }
26ba25
 
26ba25
 void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_parent)
26ba25
@@ -410,7 +428,7 @@ void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_parent)
26ba25
     int i;
26ba25
 
26ba25
     for (i = 0; i < new_parent->recursive_quiesce_counter; i++) {
26ba25
-        bdrv_do_drained_begin(child->bs, true, child, true);
26ba25
+        bdrv_do_drained_begin(child->bs, true, child, false, true);
26ba25
     }
26ba25
 }
26ba25
 
26ba25
@@ -419,7 +437,7 @@ void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent)
26ba25
     int i;
26ba25
 
26ba25
     for (i = 0; i < old_parent->recursive_quiesce_counter; i++) {
26ba25
-        bdrv_do_drained_end(child->bs, true, child);
26ba25
+        bdrv_do_drained_end(child->bs, true, child, false);
26ba25
     }
26ba25
 }
26ba25
 
26ba25
@@ -471,7 +489,7 @@ void bdrv_drain_all_begin(void)
26ba25
     BdrvNextIterator it;
26ba25
 
26ba25
     if (qemu_in_coroutine()) {
26ba25
-        bdrv_co_yield_to_drain(NULL, true, false, NULL, true);
26ba25
+        bdrv_co_yield_to_drain(NULL, true, false, NULL, false, true);
26ba25
         return;
26ba25
     }
26ba25
 
26ba25
@@ -485,7 +503,7 @@ void bdrv_drain_all_begin(void)
26ba25
         AioContext *aio_context = bdrv_get_aio_context(bs);
26ba25
 
26ba25
         aio_context_acquire(aio_context);
26ba25
-        bdrv_do_drained_begin(bs, true, NULL, true);
26ba25
+        bdrv_do_drained_begin(bs, true, NULL, false, true);
26ba25
         aio_context_release(aio_context);
26ba25
     }
26ba25
 
26ba25
@@ -503,7 +521,7 @@ void bdrv_drain_all_end(void)
26ba25
         AioContext *aio_context = bdrv_get_aio_context(bs);
26ba25
 
26ba25
         aio_context_acquire(aio_context);
26ba25
-        bdrv_do_drained_end(bs, true, NULL);
26ba25
+        bdrv_do_drained_end(bs, true, NULL, false);
26ba25
         aio_context_release(aio_context);
26ba25
     }
26ba25
 }
26ba25
diff --git a/block/vvfat.c b/block/vvfat.c
26ba25
index 4595f33..c7d2ed2 100644
26ba25
--- a/block/vvfat.c
26ba25
+++ b/block/vvfat.c
26ba25
@@ -3134,6 +3134,7 @@ static void vvfat_qcow_options(int *child_flags, QDict *child_options,
26ba25
 }
26ba25
 
26ba25
 static const BdrvChildRole child_vvfat_qcow = {
26ba25
+    .parent_is_bds      = true,
26ba25
     .inherit_options    = vvfat_qcow_options,
26ba25
 };
26ba25
 
26ba25
diff --git a/include/block/block.h b/include/block/block.h
26ba25
index 43f29b5..6e91803 100644
26ba25
--- a/include/block/block.h
26ba25
+++ b/include/block/block.h
26ba25
@@ -585,7 +585,8 @@ void bdrv_io_unplug(BlockDriverState *bs);
26ba25
  * Begin a quiesced section of all users of @bs. This is part of
26ba25
  * bdrv_drained_begin.
26ba25
  */
26ba25
-void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore);
26ba25
+void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore,
26ba25
+                               bool ignore_bds_parents);
26ba25
 
26ba25
 /**
26ba25
  * bdrv_parent_drained_end:
26ba25
@@ -593,18 +594,23 @@ void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore);
26ba25
  * End a quiesced section of all users of @bs. This is part of
26ba25
  * bdrv_drained_end.
26ba25
  */
26ba25
-void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore);
26ba25
+void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore,
26ba25
+                             bool ignore_bds_parents);
26ba25
 
26ba25
 /**
26ba25
  * bdrv_drain_poll:
26ba25
  *
26ba25
  * Poll for pending requests in @bs, its parents (except for @ignore_parent),
26ba25
- * and if @recursive is true its children as well.
26ba25
+ * and if @recursive is true its children as well (used for subtree drain).
26ba25
+ *
26ba25
+ * If @ignore_bds_parents is true, parents that are BlockDriverStates must
26ba25
+ * ignore the drain request because they will be drained separately (used for
26ba25
+ * drain_all).
26ba25
  *
26ba25
  * This is part of bdrv_drained_begin.
26ba25
  */
26ba25
 bool bdrv_drain_poll(BlockDriverState *bs, bool recursive,
26ba25
-                     BdrvChild *ignore_parent);
26ba25
+                     BdrvChild *ignore_parent, bool ignore_bds_parents);
26ba25
 
26ba25
 /**
26ba25
  * bdrv_drained_begin:
26ba25
@@ -625,7 +631,7 @@ void bdrv_drained_begin(BlockDriverState *bs);
26ba25
  * running requests to complete.
26ba25
  */
26ba25
 void bdrv_do_drained_begin_quiesce(BlockDriverState *bs,
26ba25
-                                   BdrvChild *parent);
26ba25
+                                   BdrvChild *parent, bool ignore_bds_parents);
26ba25
 
26ba25
 /**
26ba25
  * Like bdrv_drained_begin, but recursively begins a quiesced section for
26ba25
diff --git a/include/block/block_int.h b/include/block/block_int.h
26ba25
index beeacde..0ad8a76 100644
26ba25
--- a/include/block/block_int.h
26ba25
+++ b/include/block/block_int.h
26ba25
@@ -582,6 +582,12 @@ struct BdrvChildRole {
26ba25
      * points to. */
26ba25
     bool stay_at_node;
26ba25
 
26ba25
+    /* If true, the parent is a BlockDriverState and bdrv_next_all_states()
26ba25
+     * will return it. This information is used for drain_all, where every node
26ba25
+     * will be drained separately, so the drain only needs to be propagated to
26ba25
+     * non-BDS parents. */
26ba25
+    bool parent_is_bds;
26ba25
+
26ba25
     void (*inherit_options)(int *child_flags, QDict *child_options,
26ba25
                             int parent_flags, QDict *parent_options);
26ba25
 
26ba25
-- 
26ba25
1.8.3.1
26ba25