ia64/xen-unstable

changeset 16032:9a39dac6660a

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@unisys.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Tue Oct 02 09:26:18 2007 +0100 (2007-10-02)
parents 307a8688a9e3
children 74e385194be4
files tools/xm-test/configure.ac tools/xm-test/lib/XmTestLib/NetConfig.py
line diff
     1.1 --- a/tools/xm-test/configure.ac	Mon Oct 01 15:38:58 2007 +0100
     1.2 +++ b/tools/xm-test/configure.ac	Tue Oct 02 09:26:18 2007 +0100
     1.3 @@ -85,9 +85,9 @@ AC_SUBST(NET_IP_RANGE)
     1.4  AC_SUBST(NETWORK_ADDRESS)
     1.5  AC_SUBST(NETMASK)
     1.6  
     1.7 -DOM0_INTF="vif0.0"
     1.8 +DOM0_INTF="eth0"
     1.9  AC_ARG_WITH(dom0-intf,
    1.10 -        [ --with-dom0-intf=intf Set dom0 interface name [[default="vif0.0"]]],
    1.11 +        [ --with-dom0-intf=intf Set dom0 interface name [[default="eth0"]]],
    1.12          [ DOM0_INTF="$withval" ])
    1.13  
    1.14  AC_SUBST(DOM0_INTF)
     2.1 --- a/tools/xm-test/lib/XmTestLib/NetConfig.py	Mon Oct 01 15:38:58 2007 +0100
     2.2 +++ b/tools/xm-test/lib/XmTestLib/NetConfig.py	Tue Oct 02 09:26:18 2007 +0100
     2.3 @@ -71,7 +71,7 @@ def getXendNetConfig():
     2.4  
     2.5  def checkZeroconfAddresses():
     2.6      # Make sure there aren't existing zeroconf addresses.
     2.7 -    rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep -v vif")
     2.8 +    rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep eth0")
     2.9      if rc == 0:
    2.10          raise NetworkError("Zeroconf addresses already used: %s" % out)
    2.11