From nobody Tue Apr 23 14:03:39 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=1631285395; cv=none; d=zohomail.com; s=zohoarc; b=J+CCJgVdkrgj7KY4I3/xM23lH8FbUgmbifsa0UodEEnDCJkfo9iGo7r0UbJhaZorgKi3JaHWo8Wz2m6RrPeQ0aaPxjaZOJmL25zOUbooMZF0DGx3tpmENJ7Fppl0C07TxgJw/ToQWise2JTtOtdK06DVivVeUz2F9fpRSs3MLuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631285395; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=1T6VX8jqiuBTiQZ/zA+ZPO3kJZD8Ax3NIXdFWfADRVQ=; b=MZ13Ag5ymDb4FMkQEaj6vVC/CCOzKG52qexoNzxAv4WUF9ISGb2iCsXu98/aAkAErLvlAFcga4fMyWWHjV7OckvAlFbZR1158n7FaPGtEzkkn2mKEzUbvWD8OOtq1Xu84b2IDnGU6l1UmV506poGrACBf/Obsbba2D3xWe9GKNQ= 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 1631285395494205.3512027191033; Fri, 10 Sep 2021 07:49:55 -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-596-7QZdQORUPGuQzOzdiKjRYw-1; Fri, 10 Sep 2021 10:49:52 -0400 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 DECA884A5E0; Fri, 10 Sep 2021 14:49:47 +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 6DC7F19811; Fri, 10 Sep 2021 14:49:47 +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 6D0734E9F5; Fri, 10 Sep 2021 14:49:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18AEnOVf030517 for ; Fri, 10 Sep 2021 10:49:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 74A2460C7F; Fri, 10 Sep 2021 14:49:24 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id F31CC60C82 for ; Fri, 10 Sep 2021 14:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631285394; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1T6VX8jqiuBTiQZ/zA+ZPO3kJZD8Ax3NIXdFWfADRVQ=; b=gUD39wquy817No9fLSn90Ky9x1M7OHPiprkJ30Ens+UrsO8mk/iuokftZHKi/CU6XLZZdN lOxy+lGp1QTN9DVT8itnYUXo9+YZQF+OYEWzJaLv3aAnLzZ3Ng9XZnueJBbtSadLPhRLXo N0RYLumOU9uS6WUBpYtLKXixnv7jBgo= X-MC-Unique: 7QZdQORUPGuQzOzdiKjRYw-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH] src: network_conf: propagate only bool to virNetworkDefParseString() Date: Fri, 10 Sep 2021 16:48:22 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.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: 1631285396734100001 Content-Type: text/plain; charset="utf-8" We don't need to propagate all public flags, only the information about the presence of the validation one, which can differ from function to function. This patch makes it easier and more readable in case of a future additions of validation flags. This change was suggested by Daniel. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 12 ++++++------ src/conf/network_conf.h | 2 +- src/esx/esx_network_driver.c | 2 +- src/network/bridge_driver.c | 5 +++-- src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 5 +++-- src/vbox/vbox_network.c | 3 ++- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cb9e7218ff..858f6f923a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30523,7 +30523,7 @@ virDomainNetResolveActualType(virDomainNetDef *ifac= e) if (!(xml =3D virNetworkGetXMLDesc(net, 0))) goto cleanup; =20 - if (!(def =3D virNetworkDefParseString(xml, NULL, 0))) + if (!(def =3D virNetworkDefParseString(xml, NULL, false))) goto cleanup; =20 switch ((virNetworkForwardType) def->forward.type) { diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f23599abac..7a0f6f02c3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -318,7 +318,7 @@ virNetworkDefCopy(virNetworkDef *def, if (!(xml =3D virNetworkDefFormat(def, xmlopt, flags))) return NULL; =20 - return virNetworkDefParseString(xml, xmlopt, 0); + return virNetworkDefParseString(xml, xmlopt, false); } =20 =20 @@ -2086,14 +2086,14 @@ static virNetworkDef * virNetworkDefParse(const char *xmlStr, const char *filename, virNetworkXMLOption *xmlopt, - unsigned int flags) + bool validate_flag) { g_autoptr(xmlDoc) xml =3D NULL; virNetworkDef *def =3D NULL; int keepBlanksDefault =3D xmlKeepBlanksDefault(0); =20 if ((xml =3D virXMLParse(filename, xmlStr, _("(network_definition)"), - "network.rng", flags & VIR_NETWORK_DEFINE_VALID= ATE))) + "network.rng", validate_flag))) def =3D virNetworkDefParseNode(xml, xmlDocGetRootElement(xml), xml= opt); =20 xmlKeepBlanksDefault(keepBlanksDefault); @@ -2104,9 +2104,9 @@ virNetworkDefParse(const char *xmlStr, virNetworkDef * virNetworkDefParseString(const char *xmlStr, virNetworkXMLOption *xmlopt, - unsigned int flags) + bool validate_flag) { - return virNetworkDefParse(xmlStr, NULL, xmlopt, flags); + return virNetworkDefParse(xmlStr, NULL, xmlopt, validate_flag); } =20 =20 @@ -2114,7 +2114,7 @@ virNetworkDef * virNetworkDefParseFile(const char *filename, virNetworkXMLOption *xmlopt) { - return virNetworkDefParse(NULL, filename, xmlopt, 0); + return virNetworkDefParse(NULL, filename, xmlopt, false); } =20 =20 diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 30958eff64..1dda45b25c 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -329,7 +329,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, virNetworkDef * virNetworkDefParseString(const char *xmlStr, virNetworkXMLOption *xmlopt, - unsigned int flags); + bool validate_flag); =20 virNetworkDef * virNetworkDefParseFile(const char *filename, diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 673ed5421f..8acf7591cf 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -298,7 +298,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char= *xml, return NULL; =20 /* Parse network XML */ - def =3D virNetworkDefParseString(xml, NULL, flags); + def =3D virNetworkDefParseString(xml, NULL, flags & VIR_NETWORK_DEFINE= _VALIDATE); =20 if (!def) return NULL; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 06822fb3a0..4b6daf19a8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3474,7 +3474,7 @@ networkCreateXML(virConnectPtr conn, virNetworkPtr net =3D NULL; virObjectEvent *event =3D NULL; =20 - if (!(newDef =3D virNetworkDefParseString(xml, network_driver->xmlopt,= 0))) + if (!(newDef =3D virNetworkDefParseString(xml, network_driver->xmlopt,= false))) goto cleanup; =20 if (virNetworkCreateXMLEnsureACL(conn, newDef) < 0) @@ -3529,7 +3529,8 @@ networkDefineXMLFlags(virConnectPtr conn, =20 virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL); =20 - if (!(def =3D virNetworkDefParseString(xml, network_driver->xmlopt, fl= ags))) + if (!(def =3D virNetworkDefParseString(xml, network_driver->xmlopt, + flags & VIR_NETWORK_DEFINE_VALIDA= TE))) goto cleanup; =20 if (virNetworkDefineXMLFlagsEnsureACL(conn, def) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 207129a556..51d02e9fb6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4778,7 +4778,7 @@ qemuProcessGetNetworkAddress(const char *netname, if (!xml) goto cleanup; =20 - netdef =3D virNetworkDefParseString(xml, NULL, 0); + netdef =3D virNetworkDefParseString(xml, NULL, false); if (!netdef) goto cleanup; =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2f19b7c520..33f611081c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5581,7 +5581,7 @@ testNetworkCreateXML(virConnectPtr conn, const char *= xml) virNetworkPtr net =3D NULL; virObjectEvent *event =3D NULL; =20 - if ((newDef =3D virNetworkDefParseString(xml, NULL, 0)) =3D=3D NULL) + if ((newDef =3D virNetworkDefParseString(xml, NULL, false)) =3D=3D NUL= L) goto cleanup; =20 if (!(obj =3D virNetworkObjAssignDef(privconn->networks, newDef, @@ -5620,7 +5620,8 @@ testNetworkDefineXMLFlags(virConnectPtr conn, =20 virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL); =20 - if ((newDef =3D virNetworkDefParseString(xml, NULL, flags)) =3D=3D NUL= L) + if (!(newDef =3D virNetworkDefParseString(xml, NULL, + flags & VIR_NETWORK_DEFINE_VAL= IDATE))) goto cleanup; =20 if (!(obj =3D virNetworkObjAssignDef(privconn->networks, newDef, 0))) diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index c554b052c9..c0694d42d5 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -397,7 +397,8 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const ch= ar *xml, bool start, =20 VBOX_IID_INITIALIZE(&vboxnetiid); =20 - if (!(def =3D virNetworkDefParseString(xml, NULL, flags)) || + if (!(def =3D virNetworkDefParseString(xml, NULL, + flags & VIR_NETWORK_DEFINE_VALIDA= TE)) || (def->forward.type !=3D VIR_NETWORK_FORWARD_NONE) || (def->nips =3D=3D 0 || !def->ips)) goto cleanup; --=20 2.31.1