Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73931b5e authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcutorture: Add --no-initrd argument to kvm.sh 



This commit adds the --no-initrd argument to kvm.sh, which permits
initrd to be contained in a root partition specified by the --bootargs
argument.  Without --no-initrd, the kernel build expects an initrd
directory in the same rcutorture directory that contains bin and configs.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
parent e9ce6400

tools/testing/selftests/rcutorture/bin/kvm-build.sh

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ mkdir $T 


cat ${config_template} | grep -v CONFIG_RCU_TORTURE_TEST > $T/config

cat << ___EOF___ >> $T/config

CONFIG_INITRAMFS_SOURCE="$KVM/initrd"

CONFIG_INITRAMFS_SOURCE="$RCU_INITRD"

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_CONSOLE=y

___EOF___

tools/testing/selftests/rcutorture/bin/kvm.sh

+7 −2
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@ scriptname=$0 
args="$*"



dur=30

KVM=`pwd`/tools/testing/selftests/rcutorture; export KVM

builddir=${KVM}/b1

KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM

builddir="${KVM}/b1"

RCU_INITRD="$KVM/initrd"; export RCU_INITRD

resdir=""

configs=""

ds=`date +%Y.%m.%d-%H:%M:%S`
@@ -49,6 +50,7 @@ usage () { 
	echo "       --interactive"

	echo "       --kversion vN.NN"

	echo "       --mac nn:nn:nn:nn:nn:nn"

	echo "       --no-initrd"

	echo "       --qemu-args qemu-system-..."

	echo "       --qemu-cmd qemu-system-..."

	echo "       --results absolute-pathname"
@@ -122,6 +124,9 @@ do 
		RCU_QEMU_MAC=$2; export RCU_QEMU_MAC

		shift

		;;

	--no-initrd)

		RCU_INITRD=""; export RCU_INITRD

		;;

	--qemu-args)

		checkarg --qemu-args "-qemu args" $# "$2" '^-' '^error'

		RCU_QEMU_ARG="$2"