From nobody Sun May 4 11:06:57 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Authentication-Results: mx.zohomail.com;
spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1513957989401314.54606451416043;
Fri, 22 Dec 2017 07:53:09 -0800 (PST)
Received: from localhost ([::1]:55075 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1eSPd4-0000j5-3N
for importer@patchew.org; Fri, 22 Dec 2017 10:52:58 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57690)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP73-0006Cj-1W
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP71-0002qL-US
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:53 -0500
Received: from mx1.redhat.com ([209.132.183.28]:60334)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1eSP6z-0002nP-By; Fri, 22 Dec 2017 10:19:49 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 96E5F356DB;
Fri, 22 Dec 2017 15:19:48 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-117-107.ams2.redhat.com
[10.36.117.107])
by smtp.corp.redhat.com (Postfix) with ESMTP id 9AD7460C80;
Fri, 22 Dec 2017 15:19:45 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Fri, 22 Dec 2017 16:18:42 +0100
Message-Id: <20171222151846.28110-32-kwolf@redhat.com>
In-Reply-To: <20171222151846.28110-1-kwolf@redhat.com>
References: <20171222151846.28110-1-kwolf@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.30]);
Fri, 22 Dec 2017 15:19:48 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL v3 31/35] test-bdrv-drain: Recursive draining
with multiple parents
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0 Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Test that drain sections are correctly propagated through the graph.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/test-bdrv-drain.c | 74 +++++++++++++++++++++++++++++++++++++++++++++=
++++
1 file changed, 74 insertions(+)
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index 354c6151a0..690b585b4d 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -338,6 +338,79 @@ static void test_nested(void)
blk_unref(blk);
}
=20
+static void test_multiparent(void)
+{
+ BlockBackend *blk_a, *blk_b;
+ BlockDriverState *bs_a, *bs_b, *backing;
+ BDRVTestState *a_s, *b_s, *backing_s;
+
+ blk_a =3D blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+ bs_a =3D bdrv_new_open_driver(&bdrv_test, "test-node-a", BDRV_O_RDWR,
+ &error_abort);
+ a_s =3D bs_a->opaque;
+ blk_insert_bs(blk_a, bs_a, &error_abort);
+
+ blk_b =3D blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+ bs_b =3D bdrv_new_open_driver(&bdrv_test, "test-node-b", BDRV_O_RDWR,
+ &error_abort);
+ b_s =3D bs_b->opaque;
+ blk_insert_bs(blk_b, bs_b, &error_abort);
+
+ backing =3D bdrv_new_open_driver(&bdrv_test, "backing", 0, &error_abor=
t);
+ backing_s =3D backing->opaque;
+ bdrv_set_backing_hd(bs_a, backing, &error_abort);
+ bdrv_set_backing_hd(bs_b, backing, &error_abort);
+
+ g_assert_cmpint(bs_a->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(bs_b->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(backing->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(a_s->drain_count, =3D=3D, 0);
+ g_assert_cmpint(b_s->drain_count, =3D=3D, 0);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 0);
+
+ do_drain_begin(BDRV_SUBTREE_DRAIN, bs_a);
+
+ g_assert_cmpint(bs_a->quiesce_counter, =3D=3D, 1);
+ g_assert_cmpint(bs_b->quiesce_counter, =3D=3D, 1);
+ g_assert_cmpint(backing->quiesce_counter, =3D=3D, 1);
+ g_assert_cmpint(a_s->drain_count, =3D=3D, 1);
+ g_assert_cmpint(b_s->drain_count, =3D=3D, 1);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 1);
+
+ do_drain_begin(BDRV_SUBTREE_DRAIN, bs_b);
+
+ g_assert_cmpint(bs_a->quiesce_counter, =3D=3D, 2);
+ g_assert_cmpint(bs_b->quiesce_counter, =3D=3D, 2);
+ g_assert_cmpint(backing->quiesce_counter, =3D=3D, 2);
+ g_assert_cmpint(a_s->drain_count, =3D=3D, 2);
+ g_assert_cmpint(b_s->drain_count, =3D=3D, 2);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 2);
+
+ do_drain_end(BDRV_SUBTREE_DRAIN, bs_b);
+
+ g_assert_cmpint(bs_a->quiesce_counter, =3D=3D, 1);
+ g_assert_cmpint(bs_b->quiesce_counter, =3D=3D, 1);
+ g_assert_cmpint(backing->quiesce_counter, =3D=3D, 1);
+ g_assert_cmpint(a_s->drain_count, =3D=3D, 1);
+ g_assert_cmpint(b_s->drain_count, =3D=3D, 1);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 1);
+
+ do_drain_end(BDRV_SUBTREE_DRAIN, bs_a);
+
+ g_assert_cmpint(bs_a->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(bs_b->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(backing->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(a_s->drain_count, =3D=3D, 0);
+ g_assert_cmpint(b_s->drain_count, =3D=3D, 0);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 0);
+
+ bdrv_unref(backing);
+ bdrv_unref(bs_a);
+ bdrv_unref(bs_b);
+ blk_unref(blk_a);
+ blk_unref(blk_b);
+}
+
=20
typedef struct TestBlockJob {
BlockJob common;
@@ -487,6 +560,7 @@ int main(int argc, char **argv)
test_quiesce_co_drain_subtree);
=20
g_test_add_func("/bdrv-drain/nested", test_nested);
+ g_test_add_func("/bdrv-drain/multiparent", test_multiparent);
=20
g_test_add_func("/bdrv-drain/blockjob/drain_all", test_blockjob_drain_=
all);
g_test_add_func("/bdrv-drain/blockjob/drain", test_blockjob_drain);
--=20
2.13.6