[libvirt] [RFC PATCH 6/6] remove currently unused parameter to pass make check test
Gerhard Stenzel
gstenzel at linux.vnet.ibm.com
Fri Oct 2 13:48:41 UTC 2009
This patch removes the currently unused "network" parameter to pass "make check"
Signed-off-by: Gerhard Stenzel <gerhard.stenzel at de.ibm.com>
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -890,12 +890,10 @@ int virNetworkSetAutostart (virNetworkPtr network,
int virNetworkDisableAllFrames(virConnectPtr conn);
int virNetworkAllowMacOnPort(virNetworkPtr network,
- char * brname,
char * ifname,
unsigned char * mac);
int virNetworkDisallowMacOnPort(virNetworkPtr network,
- char * brname,
char * ifname,
unsigned char * mac);
---
include/libvirt/libvirt.h.in | 2 --
src/driver.h | 2 --
src/libvirt.c | 6 ++----
src/network/bridge_driver.c | 4 ----
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_driver.c | 2 +-
src/util/ebtables.c | 7 ++-----
src/util/ebtables.h | 2 --
8 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 78e5cce..13f6586 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -890,12 +890,10 @@ int virNetworkSetAutostart (virNetworkPtr network,
int virNetworkDisableAllFrames(virConnectPtr conn);
int virNetworkAllowMacOnPort(virNetworkPtr network,
- char * brname,
char * ifname,
unsigned char * mac);
int virNetworkDisallowMacOnPort(virNetworkPtr network,
- char * brname,
char * ifname,
unsigned char * mac);
diff --git a/src/driver.h b/src/driver.h
index fea6247..e3936ff 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -472,7 +472,6 @@ typedef int
int autostart);
typedef int
(*virDrvNetworkAllowMacOnPort) (virConnectPtr conn,
- char * brname,
char * ifname,
unsigned char * mac);
typedef int
@@ -480,7 +479,6 @@ typedef int
typedef int
(*virDrvNetworkDisallowMacOnPort) (virConnectPtr conn,
- char * brname,
char * ifname,
unsigned char * mac);
diff --git a/src/libvirt.c b/src/libvirt.c
index ca65beb..76d55ee 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -5498,7 +5498,6 @@ error:
int
virNetworkDisallowMacOnPort(virNetworkPtr network,
- char * brname,
char * ifname,
unsigned char * mac) {
@@ -5516,7 +5515,7 @@ virNetworkDisallowMacOnPort(virNetworkPtr network,
if (conn->networkDriver && conn->networkDriver->networkDisallowMacOnPort) {
int ret;
- ret = conn->networkDriver->networkDisallowMacOnPort (conn, brname, ifname, mac);
+ ret = conn->networkDriver->networkDisallowMacOnPort (conn, ifname, mac);
if (ret < 0)
goto error;
return ret;
@@ -5542,7 +5541,6 @@ error:
int
virNetworkAllowMacOnPort(virNetworkPtr network,
- char * brname,
char * ifname,
unsigned char * mac) {
@@ -5562,7 +5560,7 @@ virNetworkAllowMacOnPort(virNetworkPtr network,
if (conn->networkDriver && conn->networkDriver->networkAllowMacOnPort) {
int ret;
- ret = conn->networkDriver->networkAllowMacOnPort (conn, brname, ifname, mac);
+ ret = conn->networkDriver->networkAllowMacOnPort (conn, ifname, mac);
if (ret < 0)
goto error;
return ret;
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index acd7afe..7d4cf2d 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -685,7 +685,6 @@ networkDisableAllFrames(virConnectPtr conn) {
static int
networkDisallowMacOnPort(virConnectPtr conn,
- char * brname,
char * ifname,
unsigned char * mac) {
@@ -705,7 +704,6 @@ networkDisallowMacOnPort(virConnectPtr conn,
ebtablesContext * ebtablescontext = netdriver->ebtables;
if ((err = ebtablesRemoveForwardAllowIn(ebtablescontext,
- brname,
ifname,
macaddr))) {
virReportSystemError(conn, err,
@@ -718,7 +716,6 @@ networkDisallowMacOnPort(virConnectPtr conn,
static int
networkAllowMacOnPort(virConnectPtr conn,
- char * brname,
char * ifname,
unsigned char * mac) {
@@ -738,7 +735,6 @@ networkAllowMacOnPort(virConnectPtr conn,
ebtablesContext * ebtablescontext = netdriver->ebtables;
if ((err = ebtablesAddForwardAllowIn(ebtablescontext,
- brname,
ifname,
macaddr))) {
virReportSystemError(conn, err,
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 7a3b1f1..49a7b9b 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1200,7 +1200,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
if (driver->macFilter) {
virNetworkPtr network = virNetworkLookupByName(conn,
net->data.network.name);
- if ((err = virNetworkAllowMacOnPort(network, brname, net->ifname, net->mac))) {
+ if ((err = virNetworkAllowMacOnPort(network, net->ifname, net->mac))) {
virReportSystemError(conn, err,
_("failed to add ebtables rule to allow MAC address on '%s'"),
net->ifname);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a95c867..0c0af47 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2186,7 +2186,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn,
brname = virNetworkGetBridgeName(network);
if (driver->macFilter) {
- if ((errno = virNetworkDisallowMacOnPort(network, brname, net->ifname, net->mac))) {
+ if ((errno = virNetworkDisallowMacOnPort(network, net->ifname, net->mac))) {
virReportSystemError(conn, errno,
_("failed to add ebtables rule to allow MAC address on '%s'"),
net->ifname);
diff --git a/src/util/ebtables.c b/src/util/ebtables.c
index 930d046..5a86d44 100644
--- a/src/util/ebtables.c
+++ b/src/util/ebtables.c
@@ -750,7 +750,6 @@ ebtablesRemoveForwardAllowRelatedIn(ebtablesContext *ctx,
*/
static int
ebtablesForwardAllowIn(ebtablesContext *ctx,
- const char *network,
const char *iface,
const char *macaddr,
int action)
@@ -781,11 +780,10 @@ ebtablesForwardAllowIn(ebtablesContext *ctx,
*/
int
ebtablesAddForwardAllowIn(ebtablesContext *ctx,
- const char *network,
const char *iface,
const char *physdev)
{
- return ebtablesForwardAllowIn(ctx, network, iface, physdev, ADD);
+ return ebtablesForwardAllowIn(ctx, iface, physdev, ADD);
}
/**
@@ -803,11 +801,10 @@ ebtablesAddForwardAllowIn(ebtablesContext *ctx,
*/
int
ebtablesRemoveForwardAllowIn(ebtablesContext *ctx,
- const char *network,
const char *iface,
const char *physdev)
{
- return ebtablesForwardAllowIn(ctx, network, iface, physdev, REMOVE);
+ return ebtablesForwardAllowIn(ctx, iface, physdev, REMOVE);
}
diff --git a/src/util/ebtables.h b/src/util/ebtables.h
index 30b1056..2a4863b 100644
--- a/src/util/ebtables.h
+++ b/src/util/ebtables.h
@@ -96,11 +96,9 @@ int ebtablesRemoveForwardAllowRelatedIn(ebtablesContext *ctx,
const char *physdev);
int ebtablesAddForwardAllowIn (ebtablesContext *ctx,
- const char *network,
const char *iface,
const char *physdev);
int ebtablesRemoveForwardAllowIn (ebtablesContext *ctx,
- const char *network,
const char *iface,
const char *physdev);
More information about the libvir-list
mailing list