mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
torture: Rename RCU_QEMU_MAC to TORTURE_QEMU_MAC
This commit makes the torture scripts a bit more RCU-independent. It also drops an redundant "export" statement. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
This commit is contained in:
parent
a0edd47ca4
commit
58f724f741
2 changed files with 5 additions and 5 deletions
|
@ -124,7 +124,7 @@ identify_qemu_append () {
|
||||||
|
|
||||||
# identify_qemu_args qemu-cmd serial-file
|
# identify_qemu_args qemu-cmd serial-file
|
||||||
#
|
#
|
||||||
# Output arguments for qemu arguments based on the RCU_QEMU_MAC
|
# Output arguments for qemu arguments based on the TORTURE_QEMU_MAC
|
||||||
# and TORTURE_QEMU_INTERACTIVE environment variables.
|
# and TORTURE_QEMU_INTERACTIVE environment variables.
|
||||||
identify_qemu_args () {
|
identify_qemu_args () {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
|
@ -133,9 +133,9 @@ identify_qemu_args () {
|
||||||
qemu-system-ppc64)
|
qemu-system-ppc64)
|
||||||
echo -enable-kvm -M pseries -cpu POWER7 -nodefaults
|
echo -enable-kvm -M pseries -cpu POWER7 -nodefaults
|
||||||
echo -device spapr-vscsi
|
echo -device spapr-vscsi
|
||||||
if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$RCU_QEMU_MAC"
|
if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$TORTURE_QEMU_MAC"
|
||||||
then
|
then
|
||||||
echo -device spapr-vlan,netdev=net0,mac=$RCU_QEMU_MAC
|
echo -device spapr-vlan,netdev=net0,mac=$TORTURE_QEMU_MAC
|
||||||
echo -netdev bridge,br=br0,id=net0
|
echo -netdev bridge,br=br0,id=net0
|
||||||
elif test -n "$TORTURE_QEMU_INTERACTIVE"
|
elif test -n "$TORTURE_QEMU_INTERACTIVE"
|
||||||
then
|
then
|
||||||
|
|
|
@ -128,7 +128,7 @@ do
|
||||||
;;
|
;;
|
||||||
--mac)
|
--mac)
|
||||||
checkarg --mac "(MAC address)" $# "$2" '^\([0-9a-fA-F]\{2\}:\)\{5\}[0-9a-fA-F]\{2\}$' error
|
checkarg --mac "(MAC address)" $# "$2" '^\([0-9a-fA-F]\{2\}:\)\{5\}[0-9a-fA-F]\{2\}$' error
|
||||||
RCU_QEMU_MAC=$2; export RCU_QEMU_MAC
|
TORTURE_QEMU_MAC=$2
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--no-initrd)
|
--no-initrd)
|
||||||
|
@ -379,7 +379,7 @@ then
|
||||||
echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
|
echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
|
||||||
echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
|
echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
|
||||||
echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE; export TORTURE_QEMU_INTERACTIVE"
|
echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE; export TORTURE_QEMU_INTERACTIVE"
|
||||||
echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"
|
echo TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC; export TORTURE_QEMU_MAC"
|
||||||
echo "mkdir -p "$resdir" || :"
|
echo "mkdir -p "$resdir" || :"
|
||||||
echo "mkdir $resdir/$ds"
|
echo "mkdir $resdir/$ds"
|
||||||
cat $T/script
|
cat $T/script
|
||||||
|
|
Loading…
Reference in a new issue