From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 21 Nov 2011 11:45:42 +0000 (+0000)
Subject: Fix build on Mingw32 wrt export of virNetServerGetDBusConn
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=66d5d3f1861e018f2782147ff948dd314ed6ddb7;p=libvirt.git

Fix build on Mingw32 wrt export of virNetServerGetDBusConn

Mingw32 complains if you request export of a symbol which does
not in fact exist.

* src/libvirt_bridge.syms, src/libvirt_macvtap.syms: Delete
  obsolete files
* src/libvirt_private.syms: Remove virNetServerGetDBusConn
* src/libvirt_dbus.syms: Add virNetServerGetDBusConn
---

diff --git a/src/Makefile.am b/src/Makefile.am
index f82be784e0..2ee42a17d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1175,16 +1175,12 @@ if WITH_DRIVER_MODULES
 USED_SYM_FILES += libvirt_driver_modules.syms
 endif
 
-if WITH_BRIDGE
-USED_SYM_FILES += libvirt_bridge.syms
-endif
-
 if WITH_LINUX
 USED_SYM_FILES += libvirt_linux.syms
 endif
 
-if WITH_MACVTAP
-USED_SYM_FILES += libvirt_macvtap.syms
+if HAVE_DBUS
+USED_SYM_FILES += libvirt_dbus.syms
 endif
 
 if WITH_LIBVIRTD
diff --git a/src/libvirt_bridge.syms b/src/libvirt_bridge.syms
deleted file mode 100644
index 626f6eefd9..0000000000
--- a/src/libvirt_bridge.syms
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# These symbols are dependent upon --with-qemu or --with-lxc via
-# WITH_BRIDGE.
-#
-
-
-# bridge.h
-brAddBridge;
-brAddInetAddress;
-brAddInterface;
-brAddTap;
-brCreateTap;
-brDelInetAddress;
-brDeleteBridge;
-brDeleteTap;
-brHasBridge;
-brInit;
-brSetEnableSTP;
-brSetForwardDelay;
-brSetInetNetmask;
-brSetInterfaceMac;
-brSetInterfaceUp;
-brShutdown;
diff --git a/src/libvirt_dbus.syms b/src/libvirt_dbus.syms
new file mode 100644
index 0000000000..a460ec5bf8
--- /dev/null
+++ b/src/libvirt_dbus.syms
@@ -0,0 +1,2 @@
+# virnetserver.h
+virNetServerGetDBusConn;
diff --git a/src/libvirt_macvtap.syms b/src/libvirt_macvtap.syms
deleted file mode 100644
index b48565b9cf..0000000000
--- a/src/libvirt_macvtap.syms
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# These symbols are dependent on WITH_MACVTAP.
-#
-
-
-# macvtap.h
-delMacvtap;
-openMacvtapTap;
-vpAssociatePortProfileId;
-vpDisassociatePortProfileId;
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 7906f5dcc6..f4e25c1760 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1252,7 +1252,6 @@ virNetServerAddSignalHandler;
 virNetServerAutoShutdown;
 virNetServerClose;
 virNetServerFree;
-virNetServerGetDBusConn;
 virNetServerIsPrivileged;
 virNetServerNew;
 virNetServerQuit;