Rename ebtables.{c,h} to virebtables.{c,h}

diff --git a/src/Makefile.am b/src/Makefile.am
index efb23c1fc82019870bb7f8a30d315e67bc097731..498fe2def4baa1ae4bce4371b364905af121a570 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,6 @@ UTIL_SOURCES =                                                        \
                util/event_poll.c util/event_poll.h             \
                util/hooks.c util/hooks.h                       \
                util/iptables.c util/iptables.h                 \
-               util/ebtables.c util/ebtables.h                 \
                util/json.c util/json.h                         \
                util/logging.c util/logging.h                   \
                util/memory.c util/memory.h                     \
@@ -84,6 +83,7 @@ UTIL_SOURCES =                                                        \
                util/vircommand.c util/vircommand.h             \
                util/virconf.c util/virconf.h                   \
                util/virdnsmasq.c util/virdnsmasq.h             \
+               util/virebtables.c util/virebtables.h           \
                util/virfile.c util/virfile.h                   \
                util/virnodesuspend.c util/virnodesuspend.h     \
                util/virobject.c util/virobject.h               \

diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index a34a92e165f405fc43d8215b9ac9dc4ef80f7db7..a6d0d4f1ab59b0415f608888abe83288a24b4613 100644 (file)
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include "ebtables.h"
+#include "virebtables.h"
 #include "qemu_conf.h"
 #include "qemu_driver.h"
 #include "util.h"

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index eafaf9f47b0a9f6a4cadd9e76da976ff108cc886..5499203272771d3b4edd77ffc562902b1867881f 100644 (file)
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -26,7 +26,7 @@
 
 # include <config.h>
 
-# include "ebtables.h"
+# include "virebtables.h"
 # include "internal.h"
 # include "capabilities.h"
 # include "network_conf.h"

diff --git a/src/util/ebtables.c b/src/util/virebtables.c
similarity index 99%
rename from src/util/ebtables.c
rename to src/util/virebtables.c
index 4b427eeee496d41205a8b152c10eae0e74534d1a..3b97c00c717c69031f5211305968e37a327c9e08 100644 (file)
--- a/src/util/ebtables.c
+++ b/src/util/virebtables.c
@@ -1,4 +1,6 @@
 /*
+ * virebtables.c: Helper APIs for managing ebtables
+ *
  * Copyright (C) 2007-2012 Red Hat, Inc.
  * Copyright (C) 2009 IBM Corp.
  *
@@ -40,7 +42,7 @@
 #endif
 
 #include "internal.h"
-#include "ebtables.h"
+#include "virebtables.h"
 #include "vircommand.h"
 #include "memory.h"
 #include "virterror_internal.h"

diff --git a/src/util/ebtables.h b/src/util/virebtables.h
similarity index 97%
rename from src/util/ebtables.h
rename to src/util/virebtables.h
index 49dc8a0e56d0ecf083f8f4941e4ac81869610a64..671d9dcb37063d3447beea131493adc8f2b01bf3 100644 (file)
--- a/src/util/ebtables.h
+++ b/src/util/virebtables.h
@@ -1,4 +1,6 @@
 /*
+ * virebtables.c: Helper APIs for managing ebtables
+ *
  * Copyright (C) 2009 IBM Corp.
  * Copyright (C) 2007, 2008 Red Hat, Inc.
  *