From 784ce8c1c23db1b654e85804e6d19508429ce5b5 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Wed, 10 Oct 2018 20:21:49 +0100

Subject: [PATCH 23/49] test-bdrv-drain: Test graph changes in drain_all

 section

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20181010202213.7372-11-kwolf@redhat.com>

Patchwork-id: 82600

O-Subject: [RHEL-8 qemu-kvm PATCH 20/44] test-bdrv-drain: Test graph changes in drain_all section

Bugzilla: 1637976

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

This tests both adding and remove a node between bdrv_drain_all_begin()

and bdrv_drain_all_end(), and enabled the existing detach test for

drain_all.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit 19f7a7e574a099dca13120441fbe723cea9c1dc2)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 tests/test-bdrv-drain.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++--

 1 file changed, 73 insertions(+), 2 deletions(-)

diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c

index c4aa913..1c8162f 100644

--- a/tests/test-bdrv-drain.c

+++ b/tests/test-bdrv-drain.c

@@ -452,7 +452,7 @@ static void test_multiparent(void)

     blk_unref(blk_b);

 }

-static void test_graph_change(void)

+static void test_graph_change_drain_subtree(void)

 {

     BlockBackend *blk_a, *blk_b;

     BlockDriverState *bs_a, *bs_b, *backing;

@@ -531,6 +531,63 @@ static void test_graph_change(void)

     blk_unref(blk_b);

 }

+static void test_graph_change_drain_all(void)

+{

+    BlockBackend *blk_a, *blk_b;

+    BlockDriverState *bs_a, *bs_b;

+    BDRVTestState *a_s, *b_s;

+

+    /* Create node A with a BlockBackend */

+    blk_a = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);

+    bs_a = bdrv_new_open_driver(&bdrv_test, "test-node-a", BDRV_O_RDWR,

+                                &error_abort);

+    a_s = bs_a->opaque;

+    blk_insert_bs(blk_a, bs_a, &error_abort);

+

+    g_assert_cmpint(bs_a->quiesce_counter, ==, 0);

+    g_assert_cmpint(a_s->drain_count, ==, 0);

+

+    /* Call bdrv_drain_all_begin() */

+    bdrv_drain_all_begin();

+

+    g_assert_cmpint(bs_a->quiesce_counter, ==, 1);

+    g_assert_cmpint(a_s->drain_count, ==, 1);

+

+    /* Create node B with a BlockBackend */

+    blk_b = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);

+    bs_b = bdrv_new_open_driver(&bdrv_test, "test-node-b", BDRV_O_RDWR,

+                                &error_abort);

+    b_s = bs_b->opaque;

+    blk_insert_bs(blk_b, bs_b, &error_abort);

+

+    g_assert_cmpint(bs_a->quiesce_counter, ==, 1);

+    g_assert_cmpint(bs_b->quiesce_counter, ==, 1);

+    g_assert_cmpint(a_s->drain_count, ==, 1);

+    g_assert_cmpint(b_s->drain_count, ==, 1);

+

+    /* Unref and finally delete node A */

+    blk_unref(blk_a);

+

+    g_assert_cmpint(bs_a->quiesce_counter, ==, 1);

+    g_assert_cmpint(bs_b->quiesce_counter, ==, 1);

+    g_assert_cmpint(a_s->drain_count, ==, 1);

+    g_assert_cmpint(b_s->drain_count, ==, 1);

+

+    bdrv_unref(bs_a);

+

+    g_assert_cmpint(bs_b->quiesce_counter, ==, 1);

+    g_assert_cmpint(b_s->drain_count, ==, 1);

+

+    /* End the drained section */

+    bdrv_drain_all_end();

+

+    g_assert_cmpint(bs_b->quiesce_counter, ==, 0);

+    g_assert_cmpint(b_s->drain_count, ==, 0);

+

+    bdrv_unref(bs_b);

+    blk_unref(blk_b);

+}

+

 struct test_iothread_data {

     BlockDriverState *bs;

     enum drain_type drain_type;

@@ -966,6 +1023,10 @@ static void do_test_delete_by_drain(bool detach_instead_of_delete,

         bdrv_subtree_drained_begin(bs);

         bdrv_subtree_drained_end(bs);

         break;

+    case BDRV_DRAIN_ALL:

+        bdrv_drain_all_begin();

+        bdrv_drain_all_end();

+        break;

     default:

         g_assert_not_reached();

     }

@@ -986,6 +1047,11 @@ static void test_delete_by_drain(void)

     do_test_delete_by_drain(false, BDRV_DRAIN);

 }

+static void test_detach_by_drain_all(void)

+{

+    do_test_delete_by_drain(true, BDRV_DRAIN_ALL);

+}

+

 static void test_detach_by_drain(void)

 {

     do_test_delete_by_drain(true, BDRV_DRAIN);

@@ -1214,7 +1280,11 @@ int main(int argc, char **argv)

     g_test_add_func("/bdrv-drain/nested", test_nested);

     g_test_add_func("/bdrv-drain/multiparent", test_multiparent);

-    g_test_add_func("/bdrv-drain/graph-change", test_graph_change);

+

+    g_test_add_func("/bdrv-drain/graph-change/drain_subtree",

+                    test_graph_change_drain_subtree);

+    g_test_add_func("/bdrv-drain/graph-change/drain_all",

+                    test_graph_change_drain_all);

     g_test_add_func("/bdrv-drain/iothread/drain_all", test_iothread_drain_all);

     g_test_add_func("/bdrv-drain/iothread/drain", test_iothread_drain);

@@ -1227,6 +1297,7 @@ int main(int argc, char **argv)

                     test_blockjob_drain_subtree);

     g_test_add_func("/bdrv-drain/deletion/drain", test_delete_by_drain);

+    g_test_add_func("/bdrv-drain/detach/drain_all", test_detach_by_drain_all);

     g_test_add_func("/bdrv-drain/detach/drain", test_detach_by_drain);

     g_test_add_func("/bdrv-drain/detach/drain_subtree", test_detach_by_drain_subtree);

     g_test_add_func("/bdrv-drain/detach/parent_cb", test_detach_by_parent_cb);

-- 

1.8.3.1