From fa53b26026d57331e75c5e734582b7db2bf53c36 Mon Sep 17 00:00:00 2001
From: Kristina Hanicova <khanicov@redhat.com>
Date: Fri, 20 Aug 2021 13:57:06 +0200
Subject: [PATCH] nwfilter: add nwfilterDefineXMLFlags()

I have added a new driver function which allows to define
nwfilter with given flags. I have also replaced definition of
nwfilterDefineXML() with function call to the new function.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/nwfilter/nwfilter_driver.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index edb284aa4b..25391c9adf 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -525,15 +525,19 @@ nwfilterConnectListAllNWFilters(virConnectPtr conn,
     return ret;
 }
 
+
 static virNWFilterPtr
-nwfilterDefineXML(virConnectPtr conn,
-                  const char *xml)
+nwfilterDefineXMLFlags(virConnectPtr conn,
+                       const char *xml,
+                       unsigned int flags)
 {
     virNWFilterDef *def;
     virNWFilterObj *obj = NULL;
     virNWFilterDef *objdef;
     virNWFilterPtr nwfilter = NULL;
 
+    virCheckFlags(0, NULL);
+
     if (!driver->privileged) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("Can't define NWFilters in session mode"));
@@ -546,7 +550,7 @@ nwfilterDefineXML(virConnectPtr conn,
     if (!(def = virNWFilterDefParseString(xml)))
         goto cleanup;
 
-    if (virNWFilterDefineXMLEnsureACL(conn, def) < 0)
+    if (virNWFilterDefineXMLFlagsEnsureACL(conn, def) < 0)
         goto cleanup;
 
     if (!(obj = virNWFilterObjListAssignDef(driver->nwfilters, def)))
@@ -572,6 +576,14 @@ nwfilterDefineXML(virConnectPtr conn,
 }
 
 
+static virNWFilterPtr
+nwfilterDefineXML(virConnectPtr conn,
+                  const char *xml)
+{
+    return nwfilterDefineXMLFlags(conn, xml, 0);
+}
+
+
 static int
 nwfilterUndefine(virNWFilterPtr nwfilter)
 {
@@ -809,6 +821,7 @@ static virNWFilterDriver nwfilterDriver = {
     .nwfilterLookupByName = nwfilterLookupByName, /* 0.8.0 */
     .nwfilterLookupByUUID = nwfilterLookupByUUID, /* 0.8.0 */
     .nwfilterDefineXML = nwfilterDefineXML, /* 0.8.0 */
+    .nwfilterDefineXMLFlags = nwfilterDefineXMLFlags, /* 7.7.0 */
     .nwfilterUndefine = nwfilterUndefine, /* 0.8.0 */
     .nwfilterGetXMLDesc = nwfilterGetXMLDesc, /* 0.8.0 */
     .nwfilterBindingLookupByPortDev = nwfilterBindingLookupByPortDev, /* 4.5.0 */