[Xen-changelog] Add configuration option for specifying kernel to use for hvm/vmx testing

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

# HG changeset patch
# User stekloff@xxxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID eb364ce00a2415421992501a30977e7cc7c5cf48
# Parent  5b004f4e76cf90ef6f7155a4822e63b9e33cf7d8
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@xxxxxxxxxx>

diff -r 5b004f4e76cf -r eb364ce00a24 tools/xm-test/configure.ac
--- a/tools/xm-test/configure.ac        Wed Jan 25 22:35:22 2006
+++ b/tools/xm-test/configure.ac        Wed Jan 25 23:06:39 2006
@@ -37,6 +37,14 @@
 
 AM_CONDITIONAL(VMX, test x$ENABLE_VMX = xTrue)
 AC_SUBST(ENABLE_VMX)
+
+AC_ARG_WITH(vmx-kernel,
+       [[  --with-vmx-kernel=kernel       Use this kernel for vmx disk.img 
testing]],
+       VMXKERNEL=$withval,
+       VMXKERNEL="no")
+
+dnl substitute @VMXKERNEL@ in all Makefiles
+AC_SUBST(VMXKERNEL)
 
 AC_SUBST(TENV)
 AC_SUBST(PACKAGE_VERSION)
diff -r 5b004f4e76cf -r eb364ce00a24 tools/xm-test/ramdisk/Makefile.am
--- a/tools/xm-test/ramdisk/Makefile.am Wed Jan 25 22:35:22 2006
+++ b/tools/xm-test/ramdisk/Makefile.am Wed Jan 25 23:06:39 2006
@@ -45,7 +45,11 @@
 
 disk.img: $(XMTEST_VER_IMG)
        chmod a+x $(VMX_SCRIPT)
-       $(VMX_SCRIPT) -r $(XMTEST_VER_IMG)
+       @if test "$(VMXKERNEL)" = "no" ; then \
+               $(VMX_SCRIPT) -r $(XMTEST_VER_IMG); \
+       else \
+               $(VMX_SCRIPT) -r $(XMTEST_VER_IMG) -k $(VMXKERNEL); \
+       fi
 
 existing:
        @[ -f $(XMTEST_VER_IMG) ] && ln -sf $(XMTEST_VER_IMG) initrd.img || \

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