From nobody Mon Feb 9 10:48:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585120433; cv=none; d=zohomail.com; s=zohoarc; b=MusbFFXZzAEv+N8zrUgszz7kwK7SVSgaYJ19Jbp5cZl9WRmAKnUt6fA5+n0cZy9FL2Bs4BbOuQlCo8T1aT+qqIJVe+SDzfdK4NA3vuNIztSaIb1GzIW7CSQNsLlges4n/xxAmLvfEVTnWhKLkOMyln7e3hPCiq97DbgdthUUp8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120433; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=tVTeFYYoxVkml+MZgL2CClFBvngChK2AmXmflo5vwoo=; b=BFrS8Qx/WESLH6dLdgOwA8y4P46+8GFwmm1saubV89jZFeGJ8t68GyZ2qdFTkI1nNoWxPvvNfgoQS/QCcOhaIjehtdFJ0/pfGn8CN2I69XceeYnTolJw59afIxennNRQLknqNlEJSL4m9J5TKH0P2GAfc7SZpsomiW1TlaMmNv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1585120433281427.7879813087119; Wed, 25 Mar 2020 00:13:53 -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-249-FXgRNqSGP6K2G9h-yNV2lw-1; Wed, 25 Mar 2020 03:13:50 -0400 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 3BC93801A04; Wed, 25 Mar 2020 07:13:44 +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 13D095C57C; Wed, 25 Mar 2020 07:13:44 +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 C494E8A045; Wed, 25 Mar 2020 07:13:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02P7CXpZ023997 for ; Wed, 25 Mar 2020 03:12:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 807A72037E43; Wed, 25 Mar 2020 07:12:33 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CADF2026D67 for ; Wed, 25 Mar 2020 07:12:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7FDF38FF663 for ; Wed, 25 Mar 2020 07:12:30 +0000 (UTC) Received: from mail-m24147.qiye.163.com (mail-m24147.qiye.163.com [220.194.24.147]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-243-sp8Gy0MzMGOoAkzyaM3wIA-1; Wed, 25 Mar 2020 03:12:26 -0400 Received: from localhost.localdomain (unknown [123.232.151.103]) by smtp4 (Coremail) with SMTP id JedpCgD3ftNNBHtey+koAw--.408S24; Wed, 25 Mar 2020 15:12:22 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585120432; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=tVTeFYYoxVkml+MZgL2CClFBvngChK2AmXmflo5vwoo=; b=N/lHHloDDJLAwo2TXbkIQEIBDEV8VvYd4nr8D+Zdr6du6U1XHRY8fnwa/I7DL1oFpuDxOb Z3EXGUoSXhFkhUzgTcN2DZUg9/Wj6t50/NF7OgHjreWtG1n/1LeH2Mv+neZO0WBt4RavVx NBwClCwGDVPL1/dbNFwIV45ZVw0dIjI= X-MC-Unique: FXgRNqSGP6K2G9h-yNV2lw-1 X-MC-Unique: sp8Gy0MzMGOoAkzyaM3wIA-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 22/29] conf: Replace virNetworkDNSForwarderParseXML(hardcoded) with namesake(generated) Date: Wed, 25 Mar 2020 15:12:02 +0800 Message-Id: <20200325071209.20841-23-shi_lei@massclouds.com> In-Reply-To: <20200325071209.20841-1-shi_lei@massclouds.com> References: <20200325071209.20841-1-shi_lei@massclouds.com> X-CM-TRANSID: JedpCgD3ftNNBHtey+koAw--.408S24 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RHmhrUUUUU X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbihRbxT1sfnDpM7wAAss X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02P7CXpZ023997 X-loop: libvir-list@redhat.com 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 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- docs/schemas/network.rng | 1 + src/conf/network_conf.c | 31 +------------------------------ 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 20878a8..702018b 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -279,6 +279,7 @@ "structure": {"output": "src/conf/network_conf"}, "clearfunc": {"output": "src/conf/network_conf"}, "parsefunc": { + "output": "src/conf/network_conf", "post": true, "args.noctxt": true, "args.instname": true diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 91f08e9..3a43e40 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -214,7 +214,7 @@ virNetworkDefFree(virNetworkDefPtr def) } =20 =20 -static int +int virNetworkDNSForwarderParseXMLPost(xmlNodePtr curnode G_GNUC_UNUSED, virNetworkDNSForwarderPtr def, const char *networkName G_GNUC_UNUSED, @@ -232,35 +232,6 @@ virNetworkDNSForwarderParseXMLPost(xmlNodePtr curnode = G_GNUC_UNUSED, } =20 =20 -/* virNetworkDNSForwarderParseXML will be replaced by generated namesake */ -static int -virNetworkDNSForwarderParseXML(xmlNodePtr curnode, - virNetworkDNSForwarderPtr def, - const char *networkName) -{ - char *addr =3D virXMLPropString(curnode, "addr"); - if (addr && virSocketAddrParse(&def->addr, addr, AF_UNSPEC) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid forwarder IP address '%s' " - "in network '%s'"), - addr, networkName); - VIR_FREE(addr); - return -1; - } - - def->domain =3D virXMLPropString(curnode, "domain"); - - if (virNetworkDNSForwarderParseXMLPost(curnode, def, networkName, - addr, def->domain) < 0) { - VIR_FREE(addr); - return -1; - } - - VIR_FREE(addr); - return 0; -} - - /* This includes all characters used in the names of current * /etc/services and /etc/protocols files (on Fedora 20), except ".", * which we can't allow because it would conflict with the use of "." --=20 2.17.1