From nobody Thu Nov 14 07:00:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1624364723; cv=none; d=zohomail.com; s=zohoarc; b=HKS/LHkHjjriEyvl52GtSXbvuYdjM+hnp1X7BnYYOiJCdWIIISJVnq054bTHZrC66eo2QmTvXZXsYM6PwidebozDjRQ/9CR41Yln5GOiH/PONeXeRk41o0Ih1QHihakILjQ3neIdjMq307rpbwAcldpA7rKP9KD1b4dF4U4PFTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364723; 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=fVZP4zM8wc/KhF4UNM/Qz2Arx8IrHDbqOrhpxECiOAQ=; b=lpQ8N+ROrPTiEjRG55KrM5bad4lO/QDlTIORd2/hurEL7O1BOEtJ6jruZm88SBFj7grcrlQ3dtsWgqvgbXp8acQ7wf9mQ8ZW5oTvac1YKurqgiOoo3q+FHKbdGdYZotcFA6kmN3V1z2wKhXPmfL1yZHV4mHpQaaNXTbDrQdTta8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1624364723055591.8685803002456; Tue, 22 Jun 2021 05:25:23 -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-424-rbthnIzsPnenmeah0ild-w-1; Tue, 22 Jun 2021 08:24:15 -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 F07F0100C666; Tue, 22 Jun 2021 12:24:09 +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 C9FD410023B5; Tue, 22 Jun 2021 12:24:09 +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 954DA180101F; Tue, 22 Jun 2021 12:24:09 +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 15MCNPKE005277 for ; Tue, 22 Jun 2021 08:23:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id C49C419D7C; Tue, 22 Jun 2021 12:23:25 +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 1CF2219C66; Tue, 22 Jun 2021 12:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364710; 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=fVZP4zM8wc/KhF4UNM/Qz2Arx8IrHDbqOrhpxECiOAQ=; b=Ay/fmKKkzLcVcK7HfXohaEoUY8Ouunl4ALOq5Sg/6NIdcTa8IjuIvWxfZb045t9x86N+Jn lLtjxHdmSfRoqbSvr44T5+eptrMH/8SVoSjlaseu+St0iWxc0w+qodWmoti5w/57w9ua6S wFwLLpPKs+Str3RZXLz5KiJ1QUpI4iY= X-MC-Unique: rbthnIzsPnenmeah0ild-w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 15/16] virDomainFeaturesCapabilitiesDefParse: Remove ctxt Date: Tue, 22 Jun 2021 14:22:56 +0200 Message-Id: <20210622122257.12528-16-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" Iterating over all child elements of a node does not require xpath. By doing away with xpath for this code, the code can be simplified. Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 84c684b004..50717c4f44 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17483,12 +17483,8 @@ virDomainFeaturesXENDefParse(virDomainDef *def, =20 static int virDomainFeaturesCapabilitiesDefParse(virDomainDef *def, - xmlNodePtr node, - xmlXPathContext *ctxt) + xmlNodePtr node) { - g_autofree xmlNodePtr *nodes =3D NULL; - size_t i; - int n; virDomainCapabilitiesPolicy policy; =20 if (virXMLPropEnumDefault(node, "policy", @@ -17499,27 +17495,25 @@ virDomainFeaturesCapabilitiesDefParse(virDomainDe= f *def, =20 def->features[VIR_DOMAIN_FEATURE_CAPABILITIES] =3D policy; =20 - if ((n =3D virXPathNodeSet("./features/capabilities/*", ctxt, &nodes))= < 0) - return -1; - - for (i =3D 0; i < n; i++) { + node =3D xmlFirstElementChild(node); + while (node) { virTristateSwitch state; - int val =3D virDomainProcessCapsFeatureTypeFromString((const char = *)nodes[i]->name); + int val =3D virDomainProcessCapsFeatureTypeFromString((const char = *)node->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected capability feature '%s'"), nodes[= i]->name); + _("unexpected capability feature '%s'"), node->= name); return -1; } =20 =20 - if (virXMLPropTristateSwitch(nodes[i], "state", VIR_XML_PROP_NONE, - &state) < 0) + if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_NONE, &st= ate) < 0) return -1; =20 if (state =3D=3D VIR_TRISTATE_SWITCH_ABSENT) state =3D VIR_TRISTATE_SWITCH_ON; =20 def->caps_features[val] =3D state; + node =3D xmlNextElementSibling(node); } =20 return 0; @@ -17594,7 +17588,7 @@ virDomainFeaturesDefParse(virDomainDef *def, break; =20 case VIR_DOMAIN_FEATURE_CAPABILITIES: { - if (virDomainFeaturesCapabilitiesDefParse(def, nodes[i], ctxt)= < 0) + if (virDomainFeaturesCapabilitiesDefParse(def, nodes[i]) < 0) return -1; break; } --=20 2.31.1