# HG changeset patch
# User stekloff@xxxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 073a1baf139d801f6b44d34ef8300942e5e983d7
# Parent  a38c292e8390370ec9473a6444bd63be7e437afe

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 a38c292e8390 -r 073a1baf139d tools/xm-test/configure.ac
--- a/tools/xm-test/configure.ac	Tue Jan 24 16:54:34 2006
+++ b/tools/xm-test/configure.ac	Tue Jan 24 22:57:14 2006
@@ -24,6 +24,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 a38c292e8390 -r 073a1baf139d tools/xm-test/ramdisk/Makefile.am
--- a/tools/xm-test/ramdisk/Makefile.am	Tue Jan 24 16:54:34 2006
+++ b/tools/xm-test/ramdisk/Makefile.am	Tue Jan 24 22:57:14 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 || \