From nobody Mon May 5 05:01:52 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 1513957052722632.5569772016954;
Fri, 22 Dec 2017 07:37:32 -0800 (PST)
Received: from localhost ([::1]:54522 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1eSPO3-0003vW-Ju
for importer@patchew.org; Fri, 22 Dec 2017 10:37:27 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57327)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP6l-0005oU-Df
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:38 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP6g-0002Ur-4l
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:31 -0500
Received: from mx1.redhat.com ([209.132.183.28]:41878)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1eSP6d-0002Rw-B9; Fri, 22 Dec 2017 10:19:27 -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 8AA3F806B5;
Fri, 22 Dec 2017 15:19:26 +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 5953A60CA9;
Fri, 22 Dec 2017 15:19:24 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Fri, 22 Dec 2017 16:18:31 +0100
Message-Id: <20171222151846.28110-21-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.26]);
Fri, 22 Dec 2017 15:19:26 +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 20/35] test-bdrv-drain: Test callback for
bdrv_drain
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"
The existing test is for bdrv_drain_all_begin/end() only. Generalise the
test case so that it can be run for the other variants as well. At the
moment this is only bdrv_drain_begin/end(), but in a while, we'll add
another one.
Also, add a backing file to the test node to test whether the operations
work recursively.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/test-bdrv-drain.c | 69 ++++++++++++++++++++++++++++++++++++++++++++-=
----
1 file changed, 62 insertions(+), 7 deletions(-)
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index 0e567e34ba..3a3eef0f87 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -71,6 +71,8 @@ static BlockDriver bdrv_test =3D {
=20
.bdrv_co_drain_begin =3D bdrv_test_co_drain_begin,
.bdrv_co_drain_end =3D bdrv_test_co_drain_end,
+
+ .bdrv_child_perm =3D bdrv_format_default_perms,
};
=20
static void aio_ret_cb(void *opaque, int ret)
@@ -79,11 +81,34 @@ static void aio_ret_cb(void *opaque, int ret)
*aio_ret =3D ret;
}
=20
-static void test_drv_cb_drain_all(void)
+enum drain_type {
+ BDRV_DRAIN_ALL,
+ BDRV_DRAIN,
+};
+
+static void do_drain_begin(enum drain_type drain_type, BlockDriverState *b=
s)
+{
+ switch (drain_type) {
+ case BDRV_DRAIN_ALL: bdrv_drain_all_begin(); break;
+ case BDRV_DRAIN: bdrv_drained_begin(bs); break;
+ default: g_assert_not_reached();
+ }
+}
+
+static void do_drain_end(enum drain_type drain_type, BlockDriverState *bs)
+{
+ switch (drain_type) {
+ case BDRV_DRAIN_ALL: bdrv_drain_all_end(); break;
+ case BDRV_DRAIN: bdrv_drained_end(bs); break;
+ default: g_assert_not_reached();
+ }
+}
+
+static void test_drv_cb_common(enum drain_type drain_type, bool recursive)
{
BlockBackend *blk;
- BlockDriverState *bs;
- BDRVTestState *s;
+ BlockDriverState *bs, *backing;
+ BDRVTestState *s, *backing_s;
BlockAIOCB *acb;
int aio_ret;
=20
@@ -100,12 +125,23 @@ static void test_drv_cb_drain_all(void)
s =3D bs->opaque;
blk_insert_bs(blk, bs, &error_abort);
=20
+ backing =3D bdrv_new_open_driver(&bdrv_test, "backing", 0, &error_abor=
t);
+ backing_s =3D backing->opaque;
+ bdrv_set_backing_hd(bs, backing, &error_abort);
+
/* Simple bdrv_drain_all_begin/end pair, check that CBs are called */
g_assert_cmpint(s->drain_count, =3D=3D, 0);
- bdrv_drain_all_begin();
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 0);
+
+ do_drain_begin(drain_type, bs);
+
g_assert_cmpint(s->drain_count, =3D=3D, 1);
- bdrv_drain_all_end();
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, !!recursive);
+
+ do_drain_end(drain_type, bs);
+
g_assert_cmpint(s->drain_count, =3D=3D, 0);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 0);
=20
/* Now do the same while a request is pending */
aio_ret =3D -EINPROGRESS;
@@ -114,16 +150,34 @@ static void test_drv_cb_drain_all(void)
g_assert_cmpint(aio_ret, =3D=3D, -EINPROGRESS);
=20
g_assert_cmpint(s->drain_count, =3D=3D, 0);
- bdrv_drain_all_begin();
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 0);
+
+ do_drain_begin(drain_type, bs);
+
g_assert_cmpint(aio_ret, =3D=3D, 0);
g_assert_cmpint(s->drain_count, =3D=3D, 1);
- bdrv_drain_all_end();
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, !!recursive);
+
+ do_drain_end(drain_type, bs);
+
g_assert_cmpint(s->drain_count, =3D=3D, 0);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 0);
=20
+ bdrv_unref(backing);
bdrv_unref(bs);
blk_unref(blk);
}
=20
+static void test_drv_cb_drain_all(void)
+{
+ test_drv_cb_common(BDRV_DRAIN_ALL, true);
+}
+
+static void test_drv_cb_drain(void)
+{
+ test_drv_cb_common(BDRV_DRAIN, false);
+}
+
int main(int argc, char **argv)
{
bdrv_init();
@@ -132,6 +186,7 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
=20
g_test_add_func("/bdrv-drain/driver-cb/drain_all", test_drv_cb_drain_a=
ll);
+ g_test_add_func("/bdrv-drain/driver-cb/drain", test_drv_cb_drain);
=20
return g_test_run();
}
--=20
2.13.6