[Xen-changelog] [xen-unstable] xm-test: Fix bugzilla #1051.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1191313578 -3600
# Node ID 9a39dac6660a8f49f9508a1222c59c3d319d2c96
# Parent  307a8688a9e3173bf0fc47db4edc5253dedb1cdb
xm-test: Fix bugzilla #1051.

This is a patch to fix xm-test's network errors
http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1051

From: Lukasz Szymanski <Lukasz.Szymanski@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 tools/xm-test/configure.ac               |    4 ++--
 tools/xm-test/lib/XmTestLib/NetConfig.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 307a8688a9e3 -r 9a39dac6660a tools/xm-test/configure.ac
--- a/tools/xm-test/configure.ac        Mon Oct 01 15:38:58 2007 +0100
+++ b/tools/xm-test/configure.ac        Tue Oct 02 09:26:18 2007 +0100
@@ -85,9 +85,9 @@ AC_SUBST(NETWORK_ADDRESS)
 AC_SUBST(NETWORK_ADDRESS)
 AC_SUBST(NETMASK)
 
-DOM0_INTF="vif0.0"
+DOM0_INTF="eth0"
 AC_ARG_WITH(dom0-intf,
-        [ --with-dom0-intf=intf Set dom0 interface name [[default="vif0.0"]]],
+        [ --with-dom0-intf=intf Set dom0 interface name [[default="eth0"]]],
         [ DOM0_INTF="$withval" ])
 
 AC_SUBST(DOM0_INTF)
diff -r 307a8688a9e3 -r 9a39dac6660a tools/xm-test/lib/XmTestLib/NetConfig.py
--- a/tools/xm-test/lib/XmTestLib/NetConfig.py  Mon Oct 01 15:38:58 2007 +0100
+++ b/tools/xm-test/lib/XmTestLib/NetConfig.py  Tue Oct 02 09:26:18 2007 +0100
@@ -71,7 +71,7 @@ def getXendNetConfig():
 
 def checkZeroconfAddresses():
     # Make sure there aren't existing zeroconf addresses.
-    rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep -v vif")
+    rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep eth0")
     if rc == 0:
         raise NetworkError("Zeroconf addresses already used: %s" % out)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog