build: fix build --without-network

bridge_driver.h: silence gcc warnings:
statement with no effect [-Wunused-value]
unused variable 'net' [-Wunused-variable]

virdrivermoduletest.c: don't require network driver module
if it hasn't been built.

diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index 0fae275098e17ac76343ca1fe8ec5a2a0327e448..638a6ac81383b95880120ef8074ebc8bcd4c5bf0 100644 (file)
--- a/src/network/bridge_driver.h
+++ b/src/network/bridge_driver.h
@@ -53,8 +53,8 @@ int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network,
 # else
 /* Define no-op replacements that don't drag in any link dependencies.  */
 #  define networkAllocateActualDevice(iface) 0
-#  define networkNotifyActualDevice(iface) 0
-#  define networkReleaseActualDevice(iface) 0
+#  define networkNotifyActualDevice(iface) (iface=iface, 0)
+#  define networkReleaseActualDevice(iface) (iface=iface, 0)
 #  define networkGetNetworkAddress(netname, netaddr) (-2)
 #  define networkBuildDhcpDaemonCommandLine(network, cmdout, pidfile, dctx) 0
 # endif

diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 9c14e79c59ae690c6ab2bb2da6ffe3c6fd4d3bc0..53a772e765edfdcb666e35bc2362a842d0636263 100644 (file)
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -65,7 +65,10 @@ mymain(void)
     virDriverModuleInitialize(abs_builddir "/../src/.libs");
 
 #ifdef WITH_NETWORK
+# define USE_NETWORK "network"
     TEST("network", NULL);
+#else
+# define USE_NETWORK NULL
 #endif
 #ifdef WITH_STORAGE
     TEST("storage", NULL);
@@ -83,10 +86,10 @@ mymain(void)
     TEST("interface", NULL);
 #endif
 #ifdef WITH_QEMU
-    TEST("qemu", "network");
+    TEST("qemu", USE_NETWORK);
 #endif
 #ifdef WITH_LXC
-    TEST("lxc", "network");
+    TEST("lxc", USE_NETWORK);
 #endif
 #ifdef WITH_UML
     TEST("uml", NULL);