From c624ac637e414194d4ca147049eb6588581dc2be Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 2 Oct 2007 09:26:18 +0100 Subject: 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 Signed-off-by: Keir Fraser --- tools/xm-test/configure.ac | 4 ++-- tools/xm-test/lib/XmTestLib/NetConfig.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/xm-test') diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac index 14aee142b7..bbc639bdb0 100644 --- a/tools/xm-test/configure.ac +++ b/tools/xm-test/configure.ac @@ -85,9 +85,9 @@ AC_SUBST(NET_IP_RANGE) 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 --git a/tools/xm-test/lib/XmTestLib/NetConfig.py b/tools/xm-test/lib/XmTestLib/NetConfig.py index fe0cfb429f..919af65fdb 100644 --- a/tools/xm-test/lib/XmTestLib/NetConfig.py +++ b/tools/xm-test/lib/XmTestLib/NetConfig.py @@ -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) -- cgit v1.2.3