From nobody Sat Feb 7 09:29:59 2026 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491572678712223.27624992188908; Fri, 7 Apr 2017 06:44:38 -0700 (PDT) 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 2C411804F4; Fri, 7 Apr 2017 13:44:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 011C918002; Fri, 7 Apr 2017 13:44:35 +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 A2F9A18523C7; Fri, 7 Apr 2017 13:44:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v37DiWLa027114 for ; Fri, 7 Apr 2017 09:44:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id F0875A63C1; Fri, 7 Apr 2017 13:44:32 +0000 (UTC) Received: from antique-work.brq.redhat.com (dhcp129-230.brq.redhat.com [10.34.129.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77D3EB1204 for ; Fri, 7 Apr 2017 13:44:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2C411804F4 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2C411804F4 From: Pavel Hrdina To: libvir-list@redhat.com Date: Fri, 7 Apr 2017 15:44:18 +0200 Message-Id: <8f6dacc7b9ee746774880a25628abfeea25807dc.1491572622.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/8] tests: use global virQEMUDriver 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 07 Apr 2017 13:44:37 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Most tests already use global driver variable that is initialized before any test case is executed, convert these remaining tests to the same concept. Signed-off-by: Pavel Hrdina --- tests/qemuagenttest.c | 9 +++++---- tests/securityselinuxlabeltest.c | 7 ++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 41a0196c46..af7c936c8b 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -31,6 +31,10 @@ =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 + +virQEMUDriver driver; + + static int testQemuAgentFSFreeze(const void *data) { @@ -167,7 +171,6 @@ static int testQemuAgentGetFSInfo(const void *data) { virDomainXMLOptionPtr xmlopt =3D (virDomainXMLOptionPtr)data; - virCapsPtr caps =3D testQemuCapsInit(); qemuMonitorTestPtr test =3D qemuMonitorTestNewAgent(xmlopt); char *domain_filename =3D NULL; virDomainDefPtr def =3D NULL; @@ -181,7 +184,7 @@ testQemuAgentGetFSInfo(const void *data) abs_srcdir) < 0) goto cleanup; =20 - if (!(def =3D virDomainDefParseFile(domain_filename, caps, xmlopt, + if (!(def =3D virDomainDefParseFile(domain_filename, driver.caps, xmlo= pt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)= )) goto cleanup; =20 @@ -293,7 +296,6 @@ testQemuAgentGetFSInfo(const void *data) virDomainFSInfoFree(info[i]); VIR_FREE(info); VIR_FREE(domain_filename); - virObjectUnref(caps); virDomainDefFree(def); qemuMonitorTestFree(test); return ret; @@ -903,7 +905,6 @@ testQemuAgentGetInterfaces(const void *data) static int mymain(void) { - virQEMUDriver driver; int ret =3D 0; =20 #if !WITH_YAJL diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabelt= est.c index d4ef9831ad..3e134991f2 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -45,7 +45,6 @@ =20 VIR_LOG_INIT("tests.securityselinuxlabeltest"); =20 -static virCapsPtr caps; static virQEMUDriver driver; =20 static virSecurityManagerPtr mgr; @@ -189,7 +188,8 @@ testSELinuxLoadDef(const char *testname) abs_srcdir, testname) < 0) goto cleanup; =20 - if (!(def =3D virDomainDefParseFile(xmlfile, caps, driver.xmlopt, NULL= , 0))) + if (!(def =3D virDomainDefParseFile(xmlfile, driver.caps, driver.xmlop= t, + NULL, 0))) goto cleanup; =20 for (i =3D 0; i < def->ndisks; i++) { @@ -357,9 +357,6 @@ mymain(void) return EXIT_FAILURE; } =20 - if ((caps =3D testQemuCapsInit()) =3D=3D NULL) - return EXIT_FAILURE; - if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; =20 --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list