From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jones Subject: [PATCH kvm-unit-tests v2 4/9] arch-run: generate errata when no environ is provided Date: Tue, 6 Jun 2017 20:22:44 +0200 Message-ID: <20170606182249.19313-5-drjones@redhat.com> References: <20170606182249.19313-1-drjones@redhat.com> Cc: pbonzini@redhat.com, rkrcmar@redhat.com, lvivier@redhat.com, thuth@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:47722 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521AbdFFSXG (ORCPT ); Tue, 6 Jun 2017 14:23:06 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 560414E334 for ; Tue, 6 Jun 2017 18:23:01 +0000 (UTC) In-Reply-To: <20170606182249.19313-1-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Provide a table mapping errata to minimum kernel versions and a function that will use the host's kernel version to determine the values for each errata variable. These errata variables, with values based on the host kernel, are now provided to all unit tests by default, if no environ is provided. Errata variables passed from the run script environment still take precedence. Signed-off-by: Andrew Jones --- configure | 11 +++++++++++ errata.txt | 5 +++++ scripts/arch-run.bash | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 errata.txt diff --git a/configure b/configure index 64722c9b263b..cde2cfe9db61 100755 --- a/configure +++ b/configure @@ -14,6 +14,7 @@ host=$arch cross_prefix= endian="" pretty_print_stacks=yes +environ_default=yes u32_long= usage() { @@ -31,6 +32,9 @@ usage() { --endian=ENDIAN endianness to compile for (little or big, ppc64 only) --[enable|disable]-pretty-print-stacks enable or disable pretty stack printing (enabled by default) + --[enable|disable]-default-environ + enable or disable the generation of a default environ when + no environ is provided by the user (enabled by default) EOF exit 1 } @@ -73,6 +77,12 @@ while [[ "$1" = -* ]]; do --disable-pretty-print-stacks) pretty_print_stacks=no ;; + --enable-default-environ) + environ_default=yes + ;; + --disable-default-environ) + environ_default=no + ;; --help) usage ;; @@ -183,5 +193,6 @@ TEST_DIR=$testdir FIRMWARE=$firmware ENDIAN=$endian PRETTY_PRINT_STACKS=$pretty_print_stacks +ENVIRON_DEFAULT=$environ_default U32_LONG_FMT=$u32_long EOF diff --git a/errata.txt b/errata.txt new file mode 100644 index 000000000000..95b66c837c63 --- /dev/null +++ b/errata.txt @@ -0,0 +1,5 @@ +#---------------:-----------------------:-------------------------------------- +# commit : minimum kernel : summary +# 12 hex digits : version : +#---------------:-----------------------:-------------------------------------- +#---------------:-----------------------:-------------------------------------- diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash index 09072ee46366..b4aa67f3c94c 100644 --- a/scripts/arch-run.bash +++ b/scripts/arch-run.bash @@ -172,6 +172,8 @@ env_add_errata () test -v $errata && continue eval export "$line" done + elif [ ! -f "$ENV" ]; then + env_generate_errata fi if grep -q '^ERRATA_' <(env); then @@ -183,6 +185,50 @@ env_add_errata () fi } +env_generate_errata () +{ + local kernel_version_string=$(uname -r) + local kernel_version kernel_patchlevel kernel_sublevel + local line commit minver errata v p s have + + IFS=. read kernel_version kernel_patchlevel kernel_sublevel <<<$kernel_version_string + kernel_sublevel=${kernel_sublevel%%[!0-9]*} + + [ "$ENVIRON_DEFAULT" != "yes" ] && return + [ ! -f errata.txt ] && return + + for line in $(grep -v '^#' errata.txt | tr -d '[:blank:]' | cut -d: -f1,2); do + commit=${line%:*} + minver=${line#*:} + + errata="ERRATA_$commit" + test -v $errata && continue + + IFS=. read v p s <<<$minver + s=${s%%[!0-9]*} + + if (( $kernel_version > $v || + ($kernel_version == $v && $kernel_patchlevel > $p) )); then + have=y + elif (( $kernel_version == $v && $kernel_patchlevel == $p )); then + if [ "$kernel_sublevel" ] && [ "$s" ]; then + if (( $kernel_sublevel >= $s )); then + have=y + else + have=n + fi + elif [ "$s" ] && (( $s != 0 )); then + have=n + else + have=y + fi + else + have=n + fi + eval export "$errata=$have" + done +} + trap_exit_push () { local old_exit=$(trap -p EXIT | sed "s/^[^']*'//;s/'[^']*$//") -- 2.9.4