From nobody Mon Feb 9 23:43:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1641993101; cv=none; d=zohomail.com; s=zohoarc; b=L2yXr1tXcyIC2nBnKlvWc5E1v/0W44riut5pak9XeES/ZgjHVj/fvq8S1voVlMZnrr5mg+Ie2jxFmYF55Yggh/7e7yYgRHAZTW0qYXGM47CE7dwE0t9LM+o+5aQiz8snijrK96IBv2JAQkh96Wd7ZKdVPP5dk68yT40lIebFIMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641993101; 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=RU+h9JKXYMAojcvCI/vWUmsQ58N4mchDFdqHh6k40BU=; b=ZG1mJ4+HkMq1BDHme+HJ5nKvoqLHL5s7wf1hhPctj5RWgp9+ggbkLIg9yhTfaDH/bIYL92DHQgs+qEMvncz08pvqHYB0mTk2492QG+hiV0jx4U1uGQSSZnPXGx9Ax121UuQ7Nn+GLxCraYM7KPTqrVzllG8pgFJNLZVplytvYnA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1641993100998466.46087033836034; Wed, 12 Jan 2022 05:11:40 -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-111-tX50gZUCNWai67HpSF-HfA-1; Wed, 12 Jan 2022 08:11:36 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE73513EA; Wed, 12 Jan 2022 13:11:30 +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 CA93C56F8F; Wed, 12 Jan 2022 13:11:30 +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 9AF171806D1C; Wed, 12 Jan 2022 13:11:30 +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 20CDBTI0004501 for ; Wed, 12 Jan 2022 08:11:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id F3E9B26379; Wed, 12 Jan 2022 13:11:28 +0000 (UTC) Received: from work.speedport.ip (unknown [10.39.193.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EAC026373; Wed, 12 Jan 2022 13:11:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641993100; 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=RU+h9JKXYMAojcvCI/vWUmsQ58N4mchDFdqHh6k40BU=; b=V1D1b5HV3WYKBEMx1QUR0zVhVdUV10Y3WpihKhQn4I+qD6lmNdc83m39LPIW1c1EaspP+g eJg4cYWs8hYm7MRUI7OHE4qaxDFz1vIX2GHV7nfj/qSnroGR9f7VDCwHjgyczvLMDRht0r f8LeijW8Bu38VTMjFj29x9KwQcbNcLU= X-MC-Unique: tX50gZUCNWai67HpSF-HfA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 11/14] virInterfaceDefParseProtoIPv6: Simplify and cleanup Date: Wed, 12 Jan 2022 14:10:12 +0100 Message-Id: <20220112131015.100288-12-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.11 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: 1641993102907100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/interface_conf.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index c41eecac29..8be439a2a1 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -302,17 +302,14 @@ static int virInterfaceDefParseProtoIPv6(virInterfaceProtocolDef *def, xmlXPathContextPtr ctxt) { - xmlNodePtr dhcp, autoconf; + xmlNodePtr dhcp; g_autofree xmlNodePtr *ipNodes =3D NULL; int nipNodes; size_t i; - char *tmp; =20 - tmp =3D virXPathString("string(./route[1]/@gateway)", ctxt); - def->gateway =3D tmp; + def->gateway =3D virXPathString("string(./route[1]/@gateway)", ctxt); =20 - autoconf =3D virXPathNode("./autoconf", ctxt); - if (autoconf !=3D NULL) + if (virXPathNode("./autoconf", ctxt) !=3D NULL) def->autoconf =3D 1; =20 dhcp =3D virXPathNode("./dhcp", ctxt); @@ -331,10 +328,7 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDef = *def, =20 def->nips =3D 0; for (i =3D 0; i < nipNodes; i++) { - - virInterfaceIPDef *ip; - - ip =3D g_new0(virInterfaceIPDef, 1); + virInterfaceIPDef *ip =3D g_new0(virInterfaceIPDef, 1); =20 if (virInterfaceDefParseIP(ip, ipNodes[i]) < 0) { virInterfaceIPDefFree(ip); --=20 2.31.1