From nobody Thu Nov 14 07:13:04 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=1624364763; cv=none; d=zohomail.com; s=zohoarc; b=emnFuO8fX82lh39Q5UG/jufbCUjKi5xztjB/YN2bKFSIjW8HvCfV4apne+3/5lyjE2izxZ9az9cfJ1YbVrwH6JW9eOjOvpUZ+BME6mG5cGQXQkjSQMlxKntMC9p358zvKvSalKl9uERH69si9bmhM0GmedkXCOxB4dI2slw1CNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364763; 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=ustvmf9jo2Fn/XHHztAnHkTJoEOMd/oP+gTnQHMD2wE=; b=DCoXY3BNYUSJst2sjomjsdKM74yWJF2hhgPhrqEwaRagJptN45c1Tl6kVgZjhkSp/cXGsuro4AuFt85raXvWSOrHEtA/n6Es626sXfcZMaDNTyDCZRthiuDtzv54wd5VPq+RzD7LCimKLSacfYL+B4IUb664i0/afN27O2bu8Fs= 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 1624364763501523.8630424800012; Tue, 22 Jun 2021 05:26:03 -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-497-dVfYsQQ0PC-7iJdai1nvbg-1; Tue, 22 Jun 2021 08:26:00 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76F281084F4C; Tue, 22 Jun 2021 12:25:54 +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 59C6B608BA; Tue, 22 Jun 2021 12:25:54 +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 19A1B1819AC2; Tue, 22 Jun 2021 12:25:54 +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 15MCN7Uk005135 for ; Tue, 22 Jun 2021 08:23:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1514419C79; Tue, 22 Jun 2021 12:23:07 +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 63CA319C46; Tue, 22 Jun 2021 12:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364762; 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=ustvmf9jo2Fn/XHHztAnHkTJoEOMd/oP+gTnQHMD2wE=; b=YQjVIcdAX6CImLAPN76Vn6DtQeu4JCULydGNpNswbupkfP8PjvdhNH8gJPedO4KckON+t3 hwLKsehRf9QJkCigo57XIbR3NZccIh1w5J/J00IFuzwOirdT3VCnKHptJUeKPZKiKbrAbu PjzRgZj9Css4+YlNNdmXrZ/s24z9DiQ= X-MC-Unique: dVfYsQQ0PC-7iJdai1nvbg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 03/16] virDomainFeaturesHyperVDefParse: Remove ctxt Date: Tue, 22 Jun 2021 14:22:44 +0200 Message-Id: <20210622122257.12528-4-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.79 on 10.5.11.13 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 | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4ec5557eba..b778dfe463 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17288,32 +17288,27 @@ virDomainResourceDefParse(xmlNodePtr node, =20 static int virDomainFeaturesHyperVDefParse(virDomainDef *def, - xmlXPathContext *ctxt) + xmlNodePtr node) { - g_autofree xmlNodePtr *nodes =3D NULL; - size_t i; - int n; - def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D VIR_TRISTATE_SWITCH_ON; =20 if (def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D=3D VIR_TRISTATE_SWITC= H_ON) { int feature; virTristateSwitch value; - if ((n =3D virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) <= 0) - return -1; =20 - for (i =3D 0; i < n; i++) { + node =3D xmlFirstElementChild(node); + while (node !=3D NULL) { xmlNodePtr child; =20 - feature =3D virDomainHypervTypeFromString((const char *)nodes[= i]->name); + feature =3D virDomainHypervTypeFromString((const char *)node->= name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported HyperV Enlightenment feature= : %s"), - nodes[i]->name); + node->name); return -1; } =20 - if (virXMLPropTristateSwitch(nodes[i], "state", + if (virXMLPropTristateSwitch(node, "state", VIR_XML_PROP_REQUIRED, &value) < = 0) return -1; =20 @@ -17337,7 +17332,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - child =3D xmlFirstElementChild(nodes[i]); + child =3D xmlFirstElementChild(node); while (child) { if (STRNEQ((const char *)child->name, "direct")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -17359,7 +17354,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - if (virXMLPropUInt(nodes[i], "retries", 0, + if (virXMLPropUInt(node, "retries", 0, VIR_XML_PROP_REQUIRED, &def->hyperv_spinlocks) < 0) return -1; @@ -17376,7 +17371,7 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - if (!(def->hyperv_vendor_id =3D virXMLPropString(nodes[i], + if (!(def->hyperv_vendor_id =3D virXMLPropString(node, "value"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing 'value' attribute for " @@ -17403,6 +17398,8 @@ virDomainFeaturesHyperVDefParse(virDomainDef *def, case VIR_DOMAIN_HYPERV_LAST: break; } + + node =3D xmlNextElementSibling(node); } } =20 @@ -17454,7 +17451,7 @@ virDomainFeaturesDefParse(virDomainDef *def, break; =20 case VIR_DOMAIN_FEATURE_HYPERV: - if (virDomainFeaturesHyperVDefParse(def, ctxt) < 0) + if (virDomainFeaturesHyperVDefParse(def, nodes[i]) < 0) return -1; break; =20 --=20 2.31.1