From nobody Wed May 14 16:09:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1520009866438862.3003530385773; Fri, 2 Mar 2018 08:57:46 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CDFFE2BBE03; Fri, 2 Mar 2018 16:57:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E5C75C7AA; Fri, 2 Mar 2018 16:57:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8C5EA4A477; Fri, 2 Mar 2018 16:57:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w22GvejM008930 for ; Fri, 2 Mar 2018 11:57:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id F3BECAB585; Fri, 2 Mar 2018 16:57:39 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DB12AB584; Fri, 2 Mar 2018 16:57:39 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 2 Mar 2018 17:56:49 +0100 Message-Id: <45da3d8abfa704b58368cb2feccca31bb4fab110.1520009664.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 5/7] tests: util: Remove callback from testCompareDomXML2XMLFiles X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 02 Mar 2018 16:57:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The testCompareDomXML2XMLPreFormatCallback is no longer used and thus can be removed. Signed-off-by: Peter Krempa --- tests/genericxml2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 2 +- tests/qemuxml2xmltest.c | 5 ++--- tests/testutils.c | 8 +------- tests/testutils.h | 5 ----- 5 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index c33fce1922..d8270a6cae 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -40,7 +40,7 @@ testCompareXMLToXMLHelper(const void *data) ret =3D testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, - !info->inactive_only, NULL, NULL, 0, + !info->inactive_only, 0, info->expectResult); cleanup: VIR_FREE(xml_in); diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 57751a5773..3b96862c62 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -46,7 +46,7 @@ testCompareXMLToXMLHelper(const void *data) ret =3D testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, !info->inactive_only, - NULL, NULL, info->parse_flags, + info->parse_flags, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCE= SS); cleanup: VIR_FREE(xml_in); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 980d7fb0b3..ce4dae49c3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -47,8 +47,7 @@ testXML2XMLActive(const void *opaque) return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->inName, info->outActiveName, t= rue, - NULL, - opaque, 0, + 0, TEST_COMPARE_DOM_XML2XML_RESULT_SUCC= ESS); } @@ -60,7 +59,7 @@ testXML2XMLInactive(const void *opaque) return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->in= Name, info->outInactiveName, false, - NULL, opaque, 0, + 0, TEST_COMPARE_DOM_XML2XML_RESULT_SUCC= ESS); } diff --git a/tests/testutils.c b/tests/testutils.c index 17959aaf4f..040ef1d2f7 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1241,8 +1241,7 @@ virDomainXMLOptionPtr virTestGenericDomainXMLConfInit= (void) int testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, const char *infile, const char *outfile, bool l= ive, - testCompareDomXML2XMLPreFormatCallback cb, - const void *opaque, unsigned int parseFlags, + unsigned int parseFlags, testCompareDomXML2XMLResult expectResult) { char *actual =3D NULL; @@ -1273,11 +1272,6 @@ testCompareDomXML2XMLFiles(virCapsPtr caps, virDomai= nXMLOptionPtr xmlopt, goto out; } - if (cb && cb(def, opaque) < 0) { - result =3D TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_CB; - goto out; - } - if (!(actual =3D virDomainDefFormat(def, caps, format_flags))) { result =3D TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_FORMAT; goto out; diff --git a/tests/testutils.h b/tests/testutils.h index 668a79d95c..d840875bc1 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -153,20 +153,15 @@ typedef enum { TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_STABILITY, - TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_CB, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_FORMAT, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_COMPARE, } testCompareDomXML2XMLResult; -typedef int (*testCompareDomXML2XMLPreFormatCallback)(virDomainDefPtr def, - const void *opaque); int testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, const char *inxml, const char *outfile, bool live, - testCompareDomXML2XMLPreFormatCallback cb, - const void *opaque, unsigned int parseFlags, testCompareDomXML2XMLResult expectResult); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list