nwfilter: drop unused flag argument

The public API and RPC over-the-wire format have no flags argument,
so neither should the internal callback API.  This simplifies the
RPC generator.

* src/driver.h (virDrvNWFilterDefineXML): Drop argument that does
not match public API.
* src/nwfilter/nwfilter_driver.c (nwfilterDefine): Likewise.
* src/libvirt.c (virNWFilterDefineXML): Likewise.
* daemon/remote_generator.pl: Drop special case.

diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl
index 79d2021a9e703d8d7369403965634af8495a439e..dc58ce8f7b3e097d1ddb66ff34e322a8d1058cd2 100755 (executable)
--- a/daemon/remote_generator.pl
+++ b/daemon/remote_generator.pl
@@ -961,12 +961,6 @@ elsif ($opt_k) {
             push(@args_list, "virConnectPtr conn");
         }
 
-        if ($call->{ProcName} eq "NWFilterDefineXML") {
-            # SPECIAL: virNWFilterDefineXML has a flags parameter in the
-            #          public API that is missing in the XDR protocol
-            push(@args_list, "unsigned int flags ATTRIBUTE_UNUSED");
-        }
-
         # fix priv_name for the NumOf* functions
         if ($priv_name eq "privateData" and
             !($call->{ProcName} =~ m/(Domains|DomainSnapshot)/) and

diff --git a/src/driver.h b/src/driver.h
index 5cd0cead52f44c2a03e87b0cc7247231df01dd5f..ea807018d9d76e34a574651d34b980e8567b78c2 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -1181,8 +1181,7 @@ typedef virNWFilterPtr
                                                const unsigned char *uuid);
 typedef virNWFilterPtr
     (*virDrvNWFilterDefineXML)                (virConnectPtr conn,
-                                               const char *xmlDesc,
-                                               unsigned int flags);
+                                               const char *xmlDesc);
 typedef int
     (*virDrvNWFilterUndefine)                 (virNWFilterPtr nwfilter);
 

diff --git a/src/libvirt.c b/src/libvirt.c
index 0726df4a8603f70531e5bd2fdb14eaada95a451f..7564db0c71578238d6716ededf0fa91bc088f4a4 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -12253,7 +12253,7 @@ virNWFilterDefineXML(virConnectPtr conn, const char *xmlDesc)
 
     if (conn->nwfilterDriver && conn->nwfilterDriver->defineXML) {
         virNWFilterPtr ret;
-        ret = conn->nwfilterDriver->defineXML (conn, xmlDesc, 0);
+        ret = conn->nwfilterDriver->defineXML (conn, xmlDesc);
         if (!ret)
             goto error;
         return ret;

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 17af7a65a366ca18aaddcd0df6e95f4dc037a09b..18ea75297cbbd66c47c2d69cbf70586cc62d254c 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -2,7 +2,7 @@
  * nwfilter_driver.c: core driver for network filter APIs
  *                    (based on storage_driver.c)
  *
- * Copyright (C) 2006-2010 Red Hat, Inc.
+ * Copyright (C) 2006-2011 Red Hat, Inc.
  * Copyright (C) 2006-2008 Daniel P. Berrange
  * Copyright (C) 2010 IBM Corporation
  * Copyright (C) 2010 Stefan Berger
@@ -327,8 +327,8 @@ nwfilterListNWFilters(virConnectPtr conn,
 
 static virNWFilterPtr
 nwfilterDefine(virConnectPtr conn,
-               const char *xml,
-               unsigned int flags ATTRIBUTE_UNUSED) {
+               const char *xml)
+{
     virNWFilterDriverStatePtr driver = conn->nwfilterPrivateData;
     virNWFilterDefPtr def;
     virNWFilterObjPtr nwfilter = NULL;