From nobody Wed Nov 13 07:07:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1624364709; cv=none; d=zohomail.com; s=zohoarc; b=Es1skJrkeeHOYTSiW8mTTVMU+bRlR3SZG2HKNT7mayPBiwl0WrYoCy5l1246UjZHrGuZ3ie/TTZ0GfBIKud60h4TL+gkLzDSO8HkbJc5oTigLbhUzpBlTQL7lN7HBtUlIx5EsfFyy1VJmcE+pfKHQpm42ikvRJROGIBfIyXtXm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364709; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/f3lQ9aw6qSpoTj75KIV8+WgNvI0sC+QLsjv0jHQjUQ=; b=ZwCpTLczxXwltumfiP7+QbznJCG3/9oOA63oGRHOyZCsQIvDWlpQ/bkQ1YOPhJy2HTdG/lcvaq401rQlfzUEuBRjRJ7zax0ZYPUIugvPaVOKZewHCPg2i/HHvQKo+B4ORcxTGwSJj/DOqtsAi4KKRX/hEQy381eGUX5qPwGAX3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1624364709421646.4609294894196; Tue, 22 Jun 2021 05:25:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-435-8pxxy06rMUKuIGdcIdzqhg-1; Tue, 22 Jun 2021 08:24:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1790E1084F53; Tue, 22 Jun 2021 12:24:04 +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 E13A11000320; Tue, 22 Jun 2021 12:24:03 +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 A6BD94EA3D; Tue, 22 Jun 2021 12:24:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15MCNOtC005255 for ; Tue, 22 Jun 2021 08:23:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id BF19B19C66; Tue, 22 Jun 2021 12:23:24 +0000 (UTC) Received: from work.redhat.com (ovpn-113-16.ams2.redhat.com [10.36.113.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1771A19C46; Tue, 22 Jun 2021 12:23:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364708; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/f3lQ9aw6qSpoTj75KIV8+WgNvI0sC+QLsjv0jHQjUQ=; b=PYh/6vWWOGkeXc5BDNBGaAyzt21I6zndMv743RCxlxjO6/jd/B85tBoGPs54MLX0A8qw7M jQuxwvmlEjmq/+IqMp6UvUghit3miq6xK/lm9zsFLAL4hNHCfH/miktP+WvvWCfzhhQT0u kRy2gdPYgZLizrZpdYss1NNg+mkQGMw= X-MC-Unique: 8pxxy06rMUKuIGdcIdzqhg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 14/16] virDomainFeaturesDefParse: Factor out capabilities parsing into separate function Date: Tue, 22 Jun 2021 14:22:55 +0200 Message-Id: <20210622122257.12528-15-twiederh@redhat.com> In-Reply-To: <20210622122257.12528-1-twiederh@redhat.com> References: <20210622122257.12528-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Cleanup to follow. This removes the last re-use of `nodes` in this function, eliminating two VIR_FREEs. Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 78 +++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 915303adcd..84c684b004 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17481,6 +17481,51 @@ virDomainFeaturesXENDefParse(virDomainDef *def, } =20 =20 +static int +virDomainFeaturesCapabilitiesDefParse(virDomainDef *def, + xmlNodePtr node, + xmlXPathContext *ctxt) +{ + g_autofree xmlNodePtr *nodes =3D NULL; + size_t i; + int n; + virDomainCapabilitiesPolicy policy; + + if (virXMLPropEnumDefault(node, "policy", + virDomainCapabilitiesPolicyTypeFromString, + VIR_XML_PROP_NONE, &policy, + VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT) < 0) + return -1; + + def->features[VIR_DOMAIN_FEATURE_CAPABILITIES] =3D policy; + + if ((n =3D virXPathNodeSet("./features/capabilities/*", ctxt, &nodes))= < 0) + return -1; + + for (i =3D 0; i < n; i++) { + virTristateSwitch state; + int val =3D virDomainProcessCapsFeatureTypeFromString((const char = *)nodes[i]->name); + if (val < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unexpected capability feature '%s'"), nodes[= i]->name); + return -1; + } + + + if (virXMLPropTristateSwitch(nodes[i], "state", VIR_XML_PROP_NONE, + &state) < 0) + return -1; + + if (state =3D=3D VIR_TRISTATE_SWITCH_ABSENT) + state =3D VIR_TRISTATE_SWITCH_ON; + + def->caps_features[val] =3D state; + } + + return 0; +} + + static int virDomainFeaturesDefParse(virDomainDef *def, xmlXPathContextPtr ctxt) @@ -17549,15 +17594,8 @@ virDomainFeaturesDefParse(virDomainDef *def, break; =20 case VIR_DOMAIN_FEATURE_CAPABILITIES: { - virDomainCapabilitiesPolicy policy; - - if (virXMLPropEnumDefault(nodes[i], "policy", - virDomainCapabilitiesPolicyTypeFromS= tring, - VIR_XML_PROP_NONE, &policy, - VIR_DOMAIN_CAPABILITIES_POLICY_DEFAU= LT) < 0) + if (virDomainFeaturesCapabilitiesDefParse(def, nodes[i], ctxt)= < 0) return -1; - - def->features[val] =3D policy; break; } =20 @@ -17703,31 +17741,7 @@ virDomainFeaturesDefParse(virDomainDef *def, break; } } - VIR_FREE(nodes); =20 - if ((n =3D virXPathNodeSet("./features/capabilities/*", ctxt, &nodes))= < 0) - return -1; - - for (i =3D 0; i < n; i++) { - virTristateSwitch state; - int val =3D virDomainProcessCapsFeatureTypeFromString((const char = *)nodes[i]->name); - if (val < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected capability feature '%s'"), nodes[= i]->name); - return -1; - } - - - if (virXMLPropTristateSwitch(nodes[i], "state", VIR_XML_PROP_NONE, - &state) < 0) - return -1; - - if (state =3D=3D VIR_TRISTATE_SWITCH_ABSENT) - state =3D VIR_TRISTATE_SWITCH_ON; - - def->caps_features[val] =3D state; - } - VIR_FREE(nodes); return 0; } =20 --=20 2.31.1