From: stekloff@elm3b216.beaverton.ibm.com Date: Wed, 25 Jan 2006 23:06:39 +0000 (+0100) Subject: Add configuration option for specifying kernel to use for hvm/vmx testing X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16526^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c3ce14ba123e8c3c97e8583f74d78a690212ddf;p=xen.git 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 --- diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac index f61e6284cb..013ee27354 100644 --- 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 7efeee2aed..216928bd42 100644 --- 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 || \