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>

diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac
index f61e6284cb31cec4f7ea09faff29a3998901da61..013ee2735473fbc2bdef35d65e3c3d6c571910a0 100644 (file)
--- a/tools/xm-test/configure.ac
+++ b/tools/xm-test/configure.ac
@@ -38,6 +38,14 @@ fi
 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 --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am
index 7efeee2aede41af0cb06390208aca19514dea60c..216928bd428dc87644c6ff757d1d6a083b59ba26 100644 (file)
--- a/tools/xm-test/ramdisk/Makefile.am
+++ b/tools/xm-test/ramdisk/Makefile.am
@@ -45,7 +45,11 @@ initrd.img: $(XMTEST_VER_IMG)
 
 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 || \