From nobody Wed May 14 13:17:24 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152282964835653.942162149542355; Wed, 4 Apr 2018 01:14:08 -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 D6ED64E33B; Wed, 4 Apr 2018 08:14:06 +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 9CD4E1803E; Wed, 4 Apr 2018 08:14:06 +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 0D3154CA97; Wed, 4 Apr 2018 08:14:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w348E5Xp007294 for ; Wed, 4 Apr 2018 04:14:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 149642024CA1; Wed, 4 Apr 2018 08:14:05 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91DAB2024CA2; Wed, 4 Apr 2018 08:14:04 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 4 Apr 2018 10:13:54 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/6] tests: utils: Allow parsing test capability file without virCaps 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.38]); Wed, 04 Apr 2018 08:14:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" virCaps was used only to propagate the host architecture, so the function can be extracted in a way which does not require it. Signed-off-by: Peter Krempa Reviewed-by: John Ferlan --- tests/testutilsqemu.c | 21 +++++++++++++++------ tests/testutilsqemu.h | 3 +++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index f8182033fc..9671a46f12 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -486,16 +486,13 @@ qemuTestSetHostCPU(virCapsPtr caps, virQEMUCapsPtr -qemuTestParseCapabilities(virCapsPtr caps, - const char *capsFile) +qemuTestParseCapabilitiesArch(virArch arch, + const char *capsFile) { virQEMUCapsPtr qemuCaps =3D NULL; - if (!caps) - return NULL; - if (!(qemuCaps =3D virQEMUCapsNew()) || - virQEMUCapsLoadCache(caps->host.arch, qemuCaps, capsFile) < 0) + virQEMUCapsLoadCache(arch, qemuCaps, capsFile) < 0) goto error; return qemuCaps; @@ -505,6 +502,18 @@ qemuTestParseCapabilities(virCapsPtr caps, return NULL; } + +virQEMUCapsPtr +qemuTestParseCapabilities(virCapsPtr caps, + const char *capsFile) +{ + if (!caps) + return NULL; + + return qemuTestParseCapabilitiesArch(caps->host.arch, capsFile); +} + + void qemuTestDriverFree(virQEMUDriver *driver) { virMutexDestroy(&driver->lock); diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index f29c6e5d62..7ae8324933 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -16,6 +16,9 @@ enum { virCapsPtr testQemuCapsInit(void); virDomainXMLOptionPtr testQemuXMLConfInit(void); + +virQEMUCapsPtr qemuTestParseCapabilitiesArch(virArch arch, + const char *capsFile); virQEMUCapsPtr qemuTestParseCapabilities(virCapsPtr caps, const char *capsFile); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list