From: Daniel P. Berrange berra...@redhat.com
Move the ifaceMacvtapLinkDump and ifaceGetNthParent functions
into virnetdevvportprofile.c since they are specific to that
code. This avoids polluting the headers with the Linux specific
netlink data types
* src/util/interface.c, src/util/interface.h: Move
ifaceMacvtapLinkDump and ifaceGetNthParent functions and delete
remaining file
* src/util/virnetdevvportprofile.c: Add ifaceMacvtapLinkDump
and ifaceGetNthParent functions
* src/network/bridge_driver.c, src/nwfilter/nwfilter_gentech_driver.c,
src/nwfilter/nwfilter_learnipaddr.c, src/util/virnetdevmacvlan.c:
Remove include of interface.h
---
po/POTFILES.in |1 -
src/Makefile.am|1 -
src/libvirt_private.syms |2 -
src/network/bridge_driver.c|1 -
src/nwfilter/nwfilter_gentech_driver.c |2 +-
src/nwfilter/nwfilter_learnipaddr.c|1 -
src/util/interface.c | 296
src/util/interface.h | 41 -
src/util/virnetdevmacvlan.c|1 -
src/util/virnetdevvportprofile.c | 199 +-
10 files changed, 195 insertions(+), 350 deletions(-)
delete mode 100644 src/util/interface.c
delete mode 100644 src/util/interface.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6797298..403d94b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -112,7 +112,6 @@ src/util/hash.c
src/util/hooks.c
src/util/hostusb.c
src/util/iohelper.c
-src/util/interface.c
src/util/iptables.c
src/util/json.c
src/util/netlink.c
diff --git a/src/Makefile.am b/src/Makefile.am
index e44c53a..f82be78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,7 +72,6 @@ UTIL_SOURCES =
\
util/pci.c util/pci.h \
util/processinfo.c util/processinfo.h \
util/hostusb.c util/hostusb.h \
- util/interface.c util/interface.h \
util/qparams.c util/qparams.h \
util/sexpr.c util/sexpr.h \
util/stats_linux.c util/stats_linux.h \
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 0189875..131d856 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -578,14 +578,12 @@ virHookPresent;
virNetDevValidateConfig;
virNetDevGetIndex;
virNetDevGetIPv4Address;
-ifaceGetNthParent;
virNetDevGetPhysicalFunction;
virNetDevGetVirtualFunctionIndex;
virNetDevGetVLanID;
virNetDevIsVirtualFunction;
virNetDevMacVLanCreate;
virNetDevMacVLanDelete;
-ifaceMacvtapLinkDump;
virNetDevReplaceMacAddress;
virNetDevRestoreMacAddress;
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index f19bf51..7bea465 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -55,7 +55,6 @@
#include memory.h
#include uuid.h
#include iptables.h
-#include interface.h
#include logging.h
#include dnsmasq.h
#include configmake.h
diff --git a/src/nwfilter/nwfilter_gentech_driver.c
b/src/nwfilter/nwfilter_gentech_driver.c
index 9dffdc5..c9c1415 100644
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -28,13 +28,13 @@
#include memory.h
#include logging.h
-#include interface.h
#include domain_conf.h
#include virterror_internal.h
#include nwfilter_gentech_driver.h
#include nwfilter_ebiptables_driver.h
#include nwfilter_learnipaddr.h
#include virnetdev.h
+#include datatypes.h
#define VIR_FROM_THIS VIR_FROM_NWFILTER
diff --git a/src/nwfilter/nwfilter_learnipaddr.c
b/src/nwfilter/nwfilter_learnipaddr.c
index 03716ea..1843c98 100644
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -45,7 +45,6 @@
#include memory.h
#include logging.h
#include datatypes.h
-#include interface.h
#include virnetdev.h
#include virterror_internal.h
#include threads.h
diff --git a/src/util/interface.c b/src/util/interface.c
deleted file mode 100644
index 00a873e..000
--- a/src/util/interface.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * interface.c: interface support functions
- *
- * Copyright (C) 2011 Red Hat, Inc.
- * Copyright (C) 2010 IBM Corp.
- * Copyright (C) 2010 Stefan Berger
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the
