From nobody Mon Feb 9 23:43:07 2026 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=1641993102; cv=none; d=zohomail.com; s=zohoarc; b=Wvli9o75aCe/zvm8nNcyQsLwF2wAUbC3ANfnIZdi4eI/AcZYOQJMa4Ehps+AugotjlJkgznX7lroldVXNPTwcQH3e1OhHhNax6M/SMEkVHPrPF3RzqMNA+DzZXR5BRKYlroRR3zflLLDeGUpwznQjWrgnZjjwt8XsW0T5nG3MwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641993102; 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=9eyDk7399ndE1Vft0vkozauoa3wns505jjdmksufotI=; b=BXG+vZItt8QEcXgNlW0RNVNVykOdLRDw/R0PD2FeTu7POA8XFC0wHlo8feqOpKb2PK/Et2RW4/bHtvAoyKfLScOnppLgTWCgpGdOdKHusDqQey8cN8d1VtBq53vgFExsHnO7iNePaWMJuOnY60TtoouINA0JEkqqeuwvjt5f02M= 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 1641993102856846.7995324290495; Wed, 12 Jan 2022 05:11:42 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-642-kRfbB9X_P164Cb0UXAfP5g-1; Wed, 12 Jan 2022 08:11:40 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B14A21083F65; Wed, 12 Jan 2022 13:11:35 +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 8A36F7BB51; Wed, 12 Jan 2022 13:11:35 +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 563D11806D2B; Wed, 12 Jan 2022 13:11:35 +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 20CDBYYq004646 for ; Wed, 12 Jan 2022 08:11:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id BAF4026358; Wed, 12 Jan 2022 13:11:34 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 094FD2634A; Wed, 12 Jan 2022 13:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641993101; 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=9eyDk7399ndE1Vft0vkozauoa3wns505jjdmksufotI=; b=KQY3n9r+vQ+mj4TFKkimzY2u2RIPc1LUGcdvfsIXIQ6ir5jnpuE9gj2sGOHRdQ4Q/AuWxe VHJtwQnyIJ22LnhZrUZ1jiliFlDtjTndi49sYoSXuOW3OCqgXVpse0fW2z65vTvloXILwZ EL+27uHDG+GuXcKIIEZD0LBfW/So22U= X-MC-Unique: kRfbB9X_P164Cb0UXAfP5g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 12/14] virInterfaceDefParseIfAdressing: Simplify and cleanup Date: Wed, 12 Jan 2022 14:10:13 +0100 Message-Id: <20220112131015.100288-13-twiederh@redhat.com> In-Reply-To: <20220112131015.100288-1-twiederh@redhat.com> References: <20220112131015.100288-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.16 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) X-ZM-MESSAGEID: 1641993103214100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/interface_conf.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 8be439a2a1..8f8e8871cb 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -348,7 +348,6 @@ virInterfaceDefParseIfAdressing(virInterfaceDef *def, VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree xmlNodePtr *protoNodes =3D NULL; int nProtoNodes, pp; - char *tmp; =20 nProtoNodes =3D virXPathNodeSet("./protocol", ctxt, &protoNodes); if (nProtoNodes < 0) @@ -363,26 +362,24 @@ virInterfaceDefParseIfAdressing(virInterfaceDef *def, =20 def->nprotos =3D 0; for (pp =3D 0; pp < nProtoNodes; pp++) { - g_autoptr(virInterfaceProtocolDef) proto =3D g_new0(virInterfacePr= otocolDef, 1); =20 - ctxt->node =3D protoNodes[pp]; - tmp =3D virXPathString("string(./@family)", ctxt); - if (tmp =3D=3D NULL) { + if ((proto->family =3D virXMLPropString(protoNodes[pp], "family"))= =3D=3D NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("protocol misses the family attribute")= ); return -1; } - proto->family =3D tmp; - if (STREQ(tmp, "ipv4")) { + + ctxt->node =3D protoNodes[pp]; + if (STREQ(proto->family, "ipv4")) { if (virInterfaceDefParseProtoIPv4(proto, ctxt) !=3D 0) return -1; - } else if (STREQ(tmp, "ipv6")) { + } else if (STREQ(proto->family, "ipv6")) { if (virInterfaceDefParseProtoIPv6(proto, ctxt) !=3D 0) return -1; } else { virReportError(VIR_ERR_XML_ERROR, - _("unsupported protocol family '%s'"), tmp); + _("unsupported protocol family '%s'"), proto->f= amily); return -1; } def->protos[def->nprotos++] =3D g_steal_pointer(&proto); --=20 2.31.1