From nobody Thu Nov 6 19:29:25 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542819290719600.0241366735753; Wed, 21 Nov 2018 08:54:50 -0800 (PST) Received: from localhost ([::1]:40208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVm3-0008BU-KP for importer@patchew.org; Wed, 21 Nov 2018 11:54:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPVcF-0007V3-5a for qemu-devel@nongnu.org; Wed, 21 Nov 2018 11:44:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPVcE-0006jm-EH for qemu-devel@nongnu.org; Wed, 21 Nov 2018 11:44:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39550) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPVcE-0006ir-9H for qemu-devel@nongnu.org; Wed, 21 Nov 2018 11:44:38 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B883307D860; Wed, 21 Nov 2018 16:44:37 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-177.ams2.redhat.com [10.36.116.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40E1E5C241; Wed, 21 Nov 2018 16:44:36 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 21 Nov 2018 17:44:19 +0100 Message-Id: <20181121164421.20780-8-david@redhat.com> In-Reply-To: <20181121164421.20780-1-david@redhat.com> References: <20181121164421.20780-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 21 Nov 2018 16:44:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 for-4.0 7/9] test-string-input-visitor: Use virtual walk X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , David Hildenbrand , Markus Armbruster , Michael Roth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We now support virtual walks, so use that instead. Reviewed-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: David Hildenbrand --- tests/test-string-input-visitor.c | 36 +++++++++++-------------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-vi= sitor.c index c5379365a6..718d9a03c3 100644 --- a/tests/test-string-input-visitor.c +++ b/tests/test-string-input-visitor.c @@ -115,7 +115,6 @@ static void test_visitor_in_intList(TestInputVisitorDat= a *data, uint64_t expect5[] =3D { UINT64_MAX }; Error *err =3D NULL; int64List *res =3D NULL; - int64List *tail; Visitor *v; int64_t val; =20 @@ -188,39 +187,28 @@ static void test_visitor_in_intList(TestInputVisitorD= ata *data, =20 v =3D visitor_input_test_init(data, "0,2-3"); =20 - /* Would be simpler if the visitor genuinely supported virtual walks */ - visit_start_list(v, NULL, (GenericList **)&res, sizeof(*res), - &error_abort); - tail =3D res; - visit_type_int64(v, NULL, &tail->value, &error_abort); - g_assert_cmpint(tail->value, =3D=3D, 0); - tail =3D (int64List *)visit_next_list(v, (GenericList *)tail, sizeof(*= res)); - g_assert(tail); - visit_type_int64(v, NULL, &tail->value, &error_abort); - g_assert_cmpint(tail->value, =3D=3D, 2); - tail =3D (int64List *)visit_next_list(v, (GenericList *)tail, sizeof(*= res)); - g_assert(tail); + visit_start_list(v, NULL, NULL, 0, &error_abort); + visit_type_int64(v, NULL, &val, &error_abort); + g_assert_cmpint(val, =3D=3D, 0); + visit_type_int64(v, NULL, &val, &error_abort); + g_assert_cmpint(val, =3D=3D, 2); =20 visit_check_list(v, &err); error_free_or_abort(&err); - visit_end_list(v, (void **)&res); - - qapi_free_int64List(res); + visit_end_list(v, NULL); =20 /* Visit beyond end of list */ + v =3D visitor_input_test_init(data, "0"); =20 - visit_start_list(v, NULL, (GenericList **)&res, sizeof(*res), - &error_abort); - tail =3D res; - visit_type_int64(v, NULL, &tail->value, &err); - g_assert_cmpint(tail->value, =3D=3D, 0); + visit_start_list(v, NULL, NULL, 0, &error_abort); + visit_type_int64(v, NULL, &val, &err); + g_assert_cmpint(val, =3D=3D, 0); visit_type_int64(v, NULL, &val, &err); error_free_or_abort(&err); - visit_check_list(v, &error_abort); - visit_end_list(v, (void **)&res); =20 - qapi_free_int64List(res); + visit_check_list(v, &error_abort); + visit_end_list(v, NULL); } =20 static void test_visitor_in_bool(TestInputVisitorData *data, --=20 2.17.2