From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 12 Dec 2012 16:48:24 +0000 (+0000)
Subject: Rename ebtables.{c,h} to virebtables.{c,h}
X-Git-Tag: v1.0.2-rc1~342
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f14b5bce734d90ddfc820332dcd8ca930d76889c;p=thirdparty%2Flibvirt.git

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

diff --git a/src/Makefile.am b/src/Makefile.am
index efb23c1fc8..498fe2def4 100644
--- 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 a34a92e165..a6d0d4f1ab 100644
--- 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 eafaf9f47b..5499203272 100644
--- 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 4b427eeee4..3b97c00c71 100644
--- 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 49dc8a0e56..671d9dcb37 100644
--- 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.
  *