From nobody Thu May 15 21:08:23 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 1505388016944992.765947703474; Thu, 14 Sep 2017 04:20:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CF982C04B952; Thu, 14 Sep 2017 11:20:15 +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 ABEEA17AC9; Thu, 14 Sep 2017 11:20:15 +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 774B83FACE; Thu, 14 Sep 2017 11:20:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v8EAvQMw018272 for ; Thu, 14 Sep 2017 06:57:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 569E05D963; Thu, 14 Sep 2017 10:57:26 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.105]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B2735D744 for ; Thu, 14 Sep 2017 10:57:23 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 8F11D10022D; Thu, 14 Sep 2017 12:57:22 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CF982C04B952 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Jiri Denemark To: libvir-list@redhat.com Date: Thu, 14 Sep 2017 12:57:14 +0200 Message-Id: <593bdf7672eb53ae5c37fa90a8544eb4bcf9ff17.1505386577.git.jdenemar@redhat.com> In-Reply-To: References: In-Reply-To: References: Mail-Followup-To: libvir-list@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/7] cpu_conf: Introduce virCPUDefList{Parse, Free} 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 14 Sep 2017 11:20:16 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" For parsing a list of CPU XMLs into a NULL-terminated list of CPU defs. Signed-off-by: Jiri Denemark --- src/conf/cpu_conf.c | 78 ++++++++++++++++++++++++++++++++++++++++++++= ++++ src/conf/cpu_conf.h | 7 +++++ src/libvirt_private.syms | 2 ++ 3 files changed, 87 insertions(+) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index c21d11d244..7514842059 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -29,9 +29,12 @@ #include "cpu_conf.h" #include "domain_conf.h" #include "virstring.h" +#include "virlog.h" =20 #define VIR_FROM_THIS VIR_FROM_CPU =20 +VIR_LOG_INIT("conf.cpu_conf"); + VIR_ENUM_IMPL(virCPU, VIR_CPU_TYPE_LAST, "host", "guest", "auto") =20 @@ -939,3 +942,78 @@ virCPUDefIsEqual(virCPUDefPtr src, cleanup: return identical; } + + +/* + * Parses a list of CPU XMLs into a NULL-terminated list of CPU defs. + */ +virCPUDefPtr * +virCPUDefListParse(const char **xmlCPUs, + unsigned int ncpus, + virCPUType cpuType) +{ + xmlDocPtr doc =3D NULL; + xmlXPathContextPtr ctxt =3D NULL; + virCPUDefPtr *cpus =3D NULL; + size_t i; + + VIR_DEBUG("xmlCPUs=3D%p, ncpus=3D%u", xmlCPUs, ncpus); + + if (xmlCPUs) { + for (i =3D 0; i < ncpus; i++) + VIR_DEBUG("xmlCPUs[%zu]=3D%s", i, NULLSTR(xmlCPUs[i])); + } + + if (!xmlCPUs && ncpus !=3D 0) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("nonzero ncpus doesn't match with NULL xmlCPUs")); + goto error; + } + + if (ncpus < 1) { + virReportError(VIR_ERR_INVALID_ARG, "%s", _("no CPUs given")); + goto error; + } + + if (VIR_ALLOC_N(cpus, ncpus + 1)) + goto error; + + for (i =3D 0; i < ncpus; i++) { + if (!(doc =3D virXMLParseStringCtxt(xmlCPUs[i], _("(CPU_definition= )"), &ctxt))) + goto error; + + if (virCPUDefParseXML(ctxt, NULL, cpuType, &cpus[i]) < 0) + goto error; + + xmlXPathFreeContext(ctxt); + xmlFreeDoc(doc); + ctxt =3D NULL; + doc =3D NULL; + } + + return cpus; + + error: + virCPUDefListFree(cpus); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(doc); + return NULL; +} + + +/* + * Frees NULL-terminated list of CPUs created by virCPUDefListParse. + */ +void +virCPUDefListFree(virCPUDefPtr *cpus) +{ + virCPUDefPtr *cpu; + + if (!cpus) + return; + + for (cpu =3D cpus; *cpu !=3D NULL; cpu++) + virCPUDefFree(*cpu); + + VIR_FREE(cpus); +} diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index b44974f47e..d3e2c84102 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -218,4 +218,11 @@ virCPUDefUpdateFeature(virCPUDefPtr cpu, const char *name, int policy); =20 +virCPUDefPtr * +virCPUDefListParse(const char **xmlCPUs, + unsigned int ncpus, + virCPUType cpuType); +void +virCPUDefListFree(virCPUDefPtr *cpus); + #endif /* __VIR_CPU_CONF_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 247d1175ba..857e417f94 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -82,6 +82,8 @@ virCPUDefFree; virCPUDefFreeFeatures; virCPUDefFreeModel; virCPUDefIsEqual; +virCPUDefListFree; +virCPUDefListParse; virCPUDefParseXML; virCPUDefStealModel; virCPUDefUpdateFeature; --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list