From nobody Mon May 5 12:12:17 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 1513957814842982.407478176324;
Fri, 22 Dec 2017 07:50:14 -0800 (PST)
Received: from localhost ([::1]:54923 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1eSPaL-0006kL-Kc
for importer@patchew.org; Fri, 22 Dec 2017 10:50:09 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57681)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP72-0006CL-Mx
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP71-0002ps-Ku
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:52 -0500
Received: from mx1.redhat.com ([209.132.183.28]:54476)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1eSP6u-0002hS-IM; Fri, 22 Dec 2017 10:19:44 -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 B9EB179704;
Fri, 22 Dec 2017 15:19:43 +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 840D051DED;
Fri, 22 Dec 2017 15:19:42 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Fri, 22 Dec 2017 16:18:40 +0100
Message-Id: <20171222151846.28110-30-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.25]);
Fri, 22 Dec 2017 15:19:43 +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 29/35] test-bdrv-drain: Tests for
bdrv_subtree_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"
Add a subtree drain version to the existing test cases.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/test-bdrv-drain.c | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index 9098b77ab4..f363d51b34 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -85,6 +85,7 @@ static void aio_ret_cb(void *opaque, int ret)
enum drain_type {
BDRV_DRAIN_ALL,
BDRV_DRAIN,
+ BDRV_SUBTREE_DRAIN,
DRAIN_TYPE_MAX,
};
=20
@@ -93,6 +94,7 @@ static void do_drain_begin(enum drain_type drain_type, Bl=
ockDriverState *bs)
switch (drain_type) {
case BDRV_DRAIN_ALL: bdrv_drain_all_begin(); break;
case BDRV_DRAIN: bdrv_drained_begin(bs); break;
+ case BDRV_SUBTREE_DRAIN: bdrv_subtree_drained_begin(bs); break;
default: g_assert_not_reached();
}
}
@@ -102,6 +104,7 @@ static void do_drain_end(enum drain_type drain_type, Bl=
ockDriverState *bs)
switch (drain_type) {
case BDRV_DRAIN_ALL: bdrv_drain_all_end(); break;
case BDRV_DRAIN: bdrv_drained_end(bs); break;
+ case BDRV_SUBTREE_DRAIN: bdrv_subtree_drained_end(bs); break;
default: g_assert_not_reached();
}
}
@@ -180,6 +183,11 @@ static void test_drv_cb_drain(void)
test_drv_cb_common(BDRV_DRAIN, false);
}
=20
+static void test_drv_cb_drain_subtree(void)
+{
+ test_drv_cb_common(BDRV_SUBTREE_DRAIN, true);
+}
+
static void test_quiesce_common(enum drain_type drain_type, bool recursive)
{
BlockBackend *blk;
@@ -222,6 +230,11 @@ static void test_quiesce_drain(void)
test_quiesce_common(BDRV_DRAIN, false);
}
=20
+static void test_quiesce_drain_subtree(void)
+{
+ test_quiesce_common(BDRV_SUBTREE_DRAIN, true);
+}
+
static void test_nested(void)
{
BlockBackend *blk;
@@ -244,7 +257,8 @@ static void test_nested(void)
/* XXX bdrv_drain_all() doesn't increase the quiesce_counter */
int bs_quiesce =3D (outer !=3D BDRV_DRAIN_ALL) +
(inner !=3D BDRV_DRAIN_ALL);
- int backing_quiesce =3D 0;
+ int backing_quiesce =3D (outer =3D=3D BDRV_SUBTREE_DRAIN) +
+ (inner =3D=3D BDRV_SUBTREE_DRAIN);
int backing_cb_cnt =3D (outer !=3D BDRV_DRAIN) +
(inner !=3D BDRV_DRAIN);
=20
@@ -391,6 +405,11 @@ static void test_blockjob_drain(void)
test_blockjob_common(BDRV_DRAIN);
}
=20
+static void test_blockjob_drain_subtree(void)
+{
+ test_blockjob_common(BDRV_SUBTREE_DRAIN);
+}
+
int main(int argc, char **argv)
{
bdrv_init();
@@ -400,14 +419,20 @@ int main(int argc, char **argv)
=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);
+ g_test_add_func("/bdrv-drain/driver-cb/drain_subtree",
+ test_drv_cb_drain_subtree);
=20
g_test_add_func("/bdrv-drain/quiesce/drain_all", test_quiesce_drain_al=
l);
g_test_add_func("/bdrv-drain/quiesce/drain", test_quiesce_drain);
+ g_test_add_func("/bdrv-drain/quiesce/drain_subtree",
+ test_quiesce_drain_subtree);
=20
g_test_add_func("/bdrv-drain/nested", test_nested);
=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);
+ g_test_add_func("/bdrv-drain/blockjob/drain_subtree",
+ test_blockjob_drain_subtree);
=20
return g_test_run();
}
--=20
2.13.6