From nobody Mon Feb 9 15:10:59 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=1631704080; cv=none; d=zohomail.com; s=zohoarc; b=ODIL4Oj7I6aVFHtEd/4gc35Ha8R6Q3rlGphhoNo5iqqgN1Lk2u7wvU3HizViBk79TCMWTyrgEQ+tLxE7Nav7Cn4NJAsIgYZ6sTnxfsoXPviDrj0Bth4lN/BNK5rqfXjdMybvSMjp6EHaOrzLHlLE7RiU9UB/FGHG3SwizzCiMd4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631704080; h=Content-Type:Content-Transfer-Encoding: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=ajfrjy6lbmrjWjpMg7gTcGv+PU2ARgbOIXDLAl1A3lc=; b=FYn245CELxUUqkoVbVAPuOqMtG9H0ojuA3SbPLANcwZQtvK7nOd3H7uuYa3NxMMCsufyDUBG9dgrMBXXKIPs0ra3qDUl7XV7jM7jW0kaGyCqHymjPB/z7vrqnBecYmnRg0IUlFyl2q44RIxwJ9VCprmi278q/RpCQK2P8UKkHlc= 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 1631704080019454.65619569322405; Wed, 15 Sep 2021 04:08:00 -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-30-mQJWsBLRMs-b2i4Of7YsRQ-1; Wed, 15 Sep 2021 07:07:57 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18A7319057A8; Wed, 15 Sep 2021 11:07:50 +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 ECF206B556; Wed, 15 Sep 2021 11:07:49 +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 B8F8E4EA38; Wed, 15 Sep 2021 11:07:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18FB7i6D029030 for ; Wed, 15 Sep 2021 07:07:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id DB28A1001281; Wed, 15 Sep 2021 11:07:44 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 654F410023AE for ; Wed, 15 Sep 2021 11:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631704079; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ajfrjy6lbmrjWjpMg7gTcGv+PU2ARgbOIXDLAl1A3lc=; b=cl9QvdfSbOAZjqeQ9W9Kiw8j4GJYLLDnjqTafIwwy+ohfzfuqarrw6w7nfwvCoXSZUbnYD b9fv+iZcMlAV/zs/cOC0GTIYRG02WRJBI0uxmAkRPe5batCJ1z8LkacK7uyLEQL7V37uDd 3zj9f18XMUcVsyyXbtJk2efhNDt01uA= X-MC-Unique: mQJWsBLRMs-b2i4Of7YsRQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 2/5] src: add driver support for networkCreateXMLFlags() Date: Wed, 15 Sep 2021 13:07:28 +0200 Message-Id: <51ff496b286f745bec2e477714141eb0190b05f6.1631703632.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.15 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: 1631704080774100001 Content-Type: text/plain; charset="utf-8" I added new driver functions to handle creating network with given flags. I also replaced definitions of the functions without flags with function calls to the new ones. Signed-off-by: Kristina Hanicova --- src/network/bridge_driver.c | 18 +++++++++++++++--- src/test/test_driver.c | 13 ++++++++++++- src/vbox/vbox_network.c | 7 +++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 86cefbd82b..dbb8846e05 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3464,8 +3464,9 @@ networkValidate(virNetworkDriverState *driver, =20 =20 static virNetworkPtr -networkCreateXML(virConnectPtr conn, - const char *xml) +networkCreateXMLFlags(virConnectPtr conn, + const char *xml, + unsigned int flags) { virNetworkDriverState *driver =3D networkGetDriver(); virNetworkDef *newDef; @@ -3474,10 +3475,12 @@ networkCreateXML(virConnectPtr conn, virNetworkPtr net =3D NULL; virObjectEvent *event =3D NULL; =20 + virCheckFlags(0, NULL); + if (!(newDef =3D virNetworkDefParseString(xml, network_driver->xmlopt,= false))) goto cleanup; =20 - if (virNetworkCreateXMLEnsureACL(conn, newDef) < 0) + if (virNetworkCreateXMLFlagsEnsureACL(conn, newDef) < 0) goto cleanup; =20 if (networkValidate(driver, newDef) < 0) @@ -3515,6 +3518,14 @@ networkCreateXML(virConnectPtr conn, } =20 =20 +static virNetworkPtr +networkCreateXML(virConnectPtr conn, + const char *xml) +{ + return networkCreateXMLFlags(conn, xml, 0); +} + + static virNetworkPtr networkDefineXMLFlags(virConnectPtr conn, const char *xml, @@ -5630,6 +5641,7 @@ static virNetworkDriver networkDriver =3D { .networkLookupByUUID =3D networkLookupByUUID, /* 0.2.0 */ .networkLookupByName =3D networkLookupByName, /* 0.2.0 */ .networkCreateXML =3D networkCreateXML, /* 0.2.0 */ + .networkCreateXMLFlags =3D networkCreateXMLFlags, /* 7.8.0 */ .networkDefineXML =3D networkDefineXML, /* 0.2.0 */ .networkDefineXMLFlags =3D networkDefineXMLFlags, /* 7.7.0 */ .networkUndefine =3D networkUndefine, /* 0.2.0 */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2c2c6f52d1..26ff2cc759 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5572,7 +5572,8 @@ testNetworkIsPersistent(virNetworkPtr net) =20 =20 static virNetworkPtr -testNetworkCreateXML(virConnectPtr conn, const char *xml) +testNetworkCreateXMLFlags(virConnectPtr conn, const char *xml, + unsigned int flags) { testDriver *privconn =3D conn->privateData; virNetworkDef *newDef; @@ -5581,6 +5582,8 @@ testNetworkCreateXML(virConnectPtr conn, const char *= xml) virNetworkPtr net =3D NULL; virObjectEvent *event =3D NULL; =20 + virCheckFlags(0, NULL); + if ((newDef =3D virNetworkDefParseString(xml, NULL, false)) =3D=3D NUL= L) goto cleanup; =20 @@ -5606,6 +5609,13 @@ testNetworkCreateXML(virConnectPtr conn, const char = *xml) } =20 =20 +static virNetworkPtr +testNetworkCreateXML(virConnectPtr conn, const char *xml) +{ + return testNetworkCreateXMLFlags(conn, xml, 0); +} + + static virNetworkPtr testNetworkDefineXMLFlags(virConnectPtr conn, const char *xml, @@ -9723,6 +9733,7 @@ static virNetworkDriver testNetworkDriver =3D { .networkLookupByUUID =3D testNetworkLookupByUUID, /* 0.3.2 */ .networkLookupByName =3D testNetworkLookupByName, /* 0.3.2 */ .networkCreateXML =3D testNetworkCreateXML, /* 0.3.2 */ + .networkCreateXMLFlags =3D testNetworkCreateXMLFlags, /* 7.8.0 */ .networkDefineXML =3D testNetworkDefineXML, /* 0.3.2 */ .networkDefineXMLFlags =3D testNetworkDefineXMLFlags, /* 7.7.0 */ .networkUndefine =3D testNetworkUndefine, /* 0.3.2 */ diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index e772e580ad..1c23b880e8 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -561,6 +561,12 @@ static virNetworkPtr vboxNetworkCreateXML(virConnectPt= r conn, const char *xml) return vboxNetworkDefineCreateXML(conn, xml, true, 0); } =20 +static virNetworkPtr vboxNetworkCreateXMLFlags(virConnectPtr conn, const c= har *xml, + unsigned int flags) +{ + return vboxNetworkDefineCreateXML(conn, xml, true, flags); +} + static virNetworkPtr vboxNetworkDefineXML(virConnectPtr conn, const char *= xml) { return vboxNetworkDefineCreateXML(conn, xml, false, 0); @@ -930,6 +936,7 @@ virNetworkDriver vboxNetworkDriver =3D { .networkLookupByUUID =3D vboxNetworkLookupByUUID, /* 0.6.4 */ .networkLookupByName =3D vboxNetworkLookupByName, /* 0.6.4 */ .networkCreateXML =3D vboxNetworkCreateXML, /* 0.6.4 */ + .networkCreateXMLFlags =3D vboxNetworkCreateXMLFlags, /* 7.8.0 */ .networkDefineXML =3D vboxNetworkDefineXML, /* 0.6.4 */ .networkDefineXMLFlags =3D vboxNetworkDefineXMLFlags, /* 7.7.0 */ .networkUndefine =3D vboxNetworkUndefine, /* 0.6.4 */ --=20 2.31.1