queue-4.20/selftests-kvm-report-failed-stage-when-exit-reason-i.patch

   1 From 0ca8c2b3796a28f5cb5ea817cc835f92cfd5dc70 Mon Sep 17 00:00:00 2001
   2 From: Vitaly Kuznetsov <vkuznets@redhat.com>
   3 Date: Wed, 19 Dec 2018 12:15:18 +0100
   4 Subject: selftests: kvm: report failed stage when exit reason is unexpected
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 [ Upstream commit b85c32dd27495075380350fcd5d614a6b45311b8 ]
  10
  11 When we get a report like
  12
  13 ==== Test Assertion Failure ====
  14   x86_64/state_test.c:157: run->exit_reason == KVM_EXIT_IO
  15   pid=955 tid=955 - Success
  16      1  0x0000000000401350: main at state_test.c:154
  17      2  0x00007fc31c9e9412: ?? ??:0
  18      3  0x000000000040159d: _start at ??:?
  19   Unexpected exit reason: 8 (SHUTDOWN),
  20
  21 it is not obvious which particular stage failed. Add the info.
  22
  23 Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
  24 Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
  25 Signed-off-by: Sasha Levin <sashal@kernel.org>
  26 ---
  27  tools/testing/selftests/kvm/x86_64/evmcs_test.c | 4 ++--
  28  tools/testing/selftests/kvm/x86_64/state_test.c | 4 ++--
  29  2 files changed, 4 insertions(+), 4 deletions(-)
  30
  31 diff --git a/tools/testing/selftests/kvm/x86_64/evmcs_test.c b/tools/testing/selftests/kvm/x86_64/evmcs_test.c
  32 index 92c2cfd1b182..ea3c73e8f4f6 100644
  33 --- a/tools/testing/selftests/kvm/x86_64/evmcs_test.c
  34 +++ b/tools/testing/selftests/kvm/x86_64/evmcs_test.c
  35 @@ -113,8 +113,8 @@ int main(int argc, char *argv[])
  36         for (stage = 1;; stage++) {
  37                 _vcpu_run(vm, VCPU_ID);
  38                 TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
  39 -                           "Unexpected exit reason: %u (%s),\n",
  40 -                           run->exit_reason,
  41 +                           "Stage %d: unexpected exit reason: %u (%s),\n",
  42 +                           stage, run->exit_reason,
  43                             exit_reason_str(run->exit_reason));
  44
  45                 memset(&regs1, 0, sizeof(regs1));
  46 diff --git a/tools/testing/selftests/kvm/x86_64/state_test.c b/tools/testing/selftests/kvm/x86_64/state_test.c
  47 index 03da41f0f736..4b3f556265f1 100644
  48 --- a/tools/testing/selftests/kvm/x86_64/state_test.c
  49 +++ b/tools/testing/selftests/kvm/x86_64/state_test.c
  50 @@ -152,8 +152,8 @@ int main(int argc, char *argv[])
  51         for (stage = 1;; stage++) {
  52                 _vcpu_run(vm, VCPU_ID);
  53                 TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
  54 -                           "Unexpected exit reason: %u (%s),\n",
  55 -                           run->exit_reason,
  56 +                           "Stage %d: unexpected exit reason: %u (%s),\n",
  57 +                           stage, run->exit_reason,
  58                             exit_reason_str(run->exit_reason));
  59
  60                 memset(&regs1, 0, sizeof(regs1));
  61 --
  62 2.19.1
  63