direct-io.hg

changeset 8667:eb364ce00a24

Add configuration option for specifying kernel to use for hvm/vmx testing
in xm-test. Added --with-vmx-kernel=KERNEL.

Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>
author stekloff@elm3b216.beaverton.ibm.com
date Thu Jan 26 00:06:39 2006 +0100 (2006-01-26)
parents 5b004f4e76cf
children cd68f36807f9
files tools/xm-test/configure.ac tools/xm-test/ramdisk/Makefile.am
line diff
     1.1 --- a/tools/xm-test/configure.ac	Wed Jan 25 23:35:22 2006 +0100
     1.2 +++ b/tools/xm-test/configure.ac	Thu Jan 26 00:06:39 2006 +0100
     1.3 @@ -38,6 +38,14 @@ fi
     1.4  AM_CONDITIONAL(VMX, test x$ENABLE_VMX = xTrue)
     1.5  AC_SUBST(ENABLE_VMX)
     1.6  
     1.7 +AC_ARG_WITH(vmx-kernel,
     1.8 +	[[  --with-vmx-kernel=kernel       Use this kernel for vmx disk.img testing]],
     1.9 +	VMXKERNEL=$withval,
    1.10 +	VMXKERNEL="no")
    1.11 +
    1.12 +dnl substitute @VMXKERNEL@ in all Makefiles
    1.13 +AC_SUBST(VMXKERNEL)
    1.14 +
    1.15  AC_SUBST(TENV)
    1.16  AC_SUBST(PACKAGE_VERSION)
    1.17  
     2.1 --- a/tools/xm-test/ramdisk/Makefile.am	Wed Jan 25 23:35:22 2006 +0100
     2.2 +++ b/tools/xm-test/ramdisk/Makefile.am	Thu Jan 26 00:06:39 2006 +0100
     2.3 @@ -45,7 +45,11 @@ initrd.img: $(XMTEST_VER_IMG)
     2.4  
     2.5  disk.img: $(XMTEST_VER_IMG)
     2.6  	chmod a+x $(VMX_SCRIPT)
     2.7 -	$(VMX_SCRIPT) -r $(XMTEST_VER_IMG)
     2.8 +	@if test "$(VMXKERNEL)" = "no" ; then \
     2.9 +		$(VMX_SCRIPT) -r $(XMTEST_VER_IMG); \
    2.10 +	else \
    2.11 +		$(VMX_SCRIPT) -r $(XMTEST_VER_IMG) -k $(VMXKERNEL); \
    2.12 +	fi
    2.13  
    2.14  existing:
    2.15  	@[ -f $(XMTEST_VER_IMG) ] && ln -sf $(XMTEST_VER_IMG) initrd.img || \