From nobody Sun May 4 11:06:58 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 1513957507427937.5322999765342;
Fri, 22 Dec 2017 07:45:07 -0800 (PST)
Received: from localhost ([::1]:54776 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1eSPVP-0002lG-Aj
for importer@patchew.org; Fri, 22 Dec 2017 10:45:03 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57510)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP6s-00060D-57
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:45 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP6r-0002e4-3x
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:42 -0500
Received: from mx1.redhat.com ([209.132.183.28]:55854)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1eSP6o-0002af-Gu; Fri, 22 Dec 2017 10:19:38 -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 AA39DC0050CB;
Fri, 22 Dec 2017 15:19:37 +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 8D3A351DED;
Fri, 22 Dec 2017 15:19:36 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Fri, 22 Dec 2017 16:18:37 +0100
Message-Id: <20171222151846.28110-27-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.32]);
Fri, 22 Dec 2017 15:19:37 +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 26/35] test-bdrv-drain: Test nested drain
sections
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"
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/test-bdrv-drain.c | 57 +++++++++++++++++++++++++++++++++++++++++++++=
++++
1 file changed, 57 insertions(+)
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index 6da66ae841..9098b77ab4 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,
+ DRAIN_TYPE_MAX,
};
=20
static void do_drain_begin(enum drain_type drain_type, BlockDriverState *b=
s)
@@ -221,6 +222,60 @@ static void test_quiesce_drain(void)
test_quiesce_common(BDRV_DRAIN, false);
}
=20
+static void test_nested(void)
+{
+ BlockBackend *blk;
+ BlockDriverState *bs, *backing;
+ BDRVTestState *s, *backing_s;
+ enum drain_type outer, inner;
+
+ blk =3D blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+ bs =3D bdrv_new_open_driver(&bdrv_test, "test-node", BDRV_O_RDWR,
+ &error_abort);
+ s =3D bs->opaque;
+ blk_insert_bs(blk, bs, &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, backing, &error_abort);
+
+ for (outer =3D 0; outer < DRAIN_TYPE_MAX; outer++) {
+ for (inner =3D 0; inner < DRAIN_TYPE_MAX; inner++) {
+ /* 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_cb_cnt =3D (outer !=3D BDRV_DRAIN) +
+ (inner !=3D BDRV_DRAIN);
+
+ g_assert_cmpint(bs->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(backing->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(s->drain_count, =3D=3D, 0);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 0);
+
+ do_drain_begin(outer, bs);
+ do_drain_begin(inner, bs);
+
+ g_assert_cmpint(bs->quiesce_counter, =3D=3D, bs_quiesce);
+ g_assert_cmpint(backing->quiesce_counter, =3D=3D, backing_quie=
sce);
+ g_assert_cmpint(s->drain_count, =3D=3D, 2);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, backing_cb_cnt=
);
+
+ do_drain_end(inner, bs);
+ do_drain_end(outer, bs);
+
+ g_assert_cmpint(bs->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(backing->quiesce_counter, =3D=3D, 0);
+ g_assert_cmpint(s->drain_count, =3D=3D, 0);
+ g_assert_cmpint(backing_s->drain_count, =3D=3D, 0);
+ }
+ }
+
+ bdrv_unref(backing);
+ bdrv_unref(bs);
+ blk_unref(blk);
+}
+
=20
typedef struct TestBlockJob {
BlockJob common;
@@ -349,6 +404,8 @@ int main(int argc, char **argv)
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);
=20
+ g_test_add_func("/bdrv-drain/nested", test_nested);
+
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
--=20
2.13.6