26ba25
From 38f4c8c2161484794015df1d44a8e84d7e4cddb3 Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Wed, 10 Oct 2018 20:21:51 +0100
26ba25
Subject: [PATCH 25/49] test-bdrv-drain: Test bdrv_append() to drained node
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20181010202213.7372-13-kwolf@redhat.com>
26ba25
Patchwork-id: 82602
26ba25
O-Subject: [RHEL-8 qemu-kvm PATCH 22/44] test-bdrv-drain: Test bdrv_append() to drained node
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
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
(cherry picked from commit b994c5bc515fe611885113e7cfa7e87817bfd4e2)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 tests/test-bdrv-drain.c | 43 +++++++++++++++++++++++++++++++++++++++++++
26ba25
 1 file changed, 43 insertions(+)
26ba25
26ba25
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
26ba25
index 1c8162f..9bcb3c7 100644
26ba25
--- a/tests/test-bdrv-drain.c
26ba25
+++ b/tests/test-bdrv-drain.c
26ba25
@@ -1245,6 +1245,47 @@ static void test_detach_by_driver_cb(void)
26ba25
     test_detach_indirect(false);
26ba25
 }
26ba25
 
26ba25
+static void test_append_to_drained(void)
26ba25
+{
26ba25
+    BlockBackend *blk;
26ba25
+    BlockDriverState *base, *overlay;
26ba25
+    BDRVTestState *base_s, *overlay_s;
26ba25
+
26ba25
+    blk = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
26ba25
+    base = bdrv_new_open_driver(&bdrv_test, "base", BDRV_O_RDWR, &error_abort);
26ba25
+    base_s = base->opaque;
26ba25
+    blk_insert_bs(blk, base, &error_abort);
26ba25
+
26ba25
+    overlay = bdrv_new_open_driver(&bdrv_test, "overlay", BDRV_O_RDWR,
26ba25
+                                   &error_abort);
26ba25
+    overlay_s = overlay->opaque;
26ba25
+
26ba25
+    do_drain_begin(BDRV_DRAIN, base);
26ba25
+    g_assert_cmpint(base->quiesce_counter, ==, 1);
26ba25
+    g_assert_cmpint(base_s->drain_count, ==, 1);
26ba25
+    g_assert_cmpint(base->in_flight, ==, 0);
26ba25
+
26ba25
+    /* Takes ownership of overlay, so we don't have to unref it later */
26ba25
+    bdrv_append(overlay, base, &error_abort);
26ba25
+    g_assert_cmpint(base->in_flight, ==, 0);
26ba25
+    g_assert_cmpint(overlay->in_flight, ==, 0);
26ba25
+
26ba25
+    g_assert_cmpint(base->quiesce_counter, ==, 1);
26ba25
+    g_assert_cmpint(base_s->drain_count, ==, 1);
26ba25
+    g_assert_cmpint(overlay->quiesce_counter, ==, 1);
26ba25
+    g_assert_cmpint(overlay_s->drain_count, ==, 1);
26ba25
+
26ba25
+    do_drain_end(BDRV_DRAIN, base);
26ba25
+
26ba25
+    g_assert_cmpint(base->quiesce_counter, ==, 0);
26ba25
+    g_assert_cmpint(base_s->drain_count, ==, 0);
26ba25
+    g_assert_cmpint(overlay->quiesce_counter, ==, 0);
26ba25
+    g_assert_cmpint(overlay_s->drain_count, ==, 0);
26ba25
+
26ba25
+    bdrv_unref(base);
26ba25
+    blk_unref(blk);
26ba25
+}
26ba25
+
26ba25
 int main(int argc, char **argv)
26ba25
 {
26ba25
     int ret;
26ba25
@@ -1303,6 +1344,8 @@ int main(int argc, char **argv)
26ba25
     g_test_add_func("/bdrv-drain/detach/parent_cb", test_detach_by_parent_cb);
26ba25
     g_test_add_func("/bdrv-drain/detach/driver_cb", test_detach_by_driver_cb);
26ba25
 
26ba25
+    g_test_add_func("/bdrv-drain/attach/drain", test_append_to_drained);
26ba25
+
26ba25
     ret = g_test_run();
26ba25
     qemu_event_destroy(&done_event);
26ba25
     return ret;
26ba25
-- 
26ba25
1.8.3.1
26ba25