From c517a6a3691a0097e8fa0aae4bd4657a43307156 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 27 Sep 2017 11:21:36 +0200
Subject: [PATCH] cputest: Print correct feature in virCPUUpdateLive test

If the actual result does not match our expectation, the tests would
not correctly show the difference if a CPU feature is disabled in the
expected result and the actual result does not mention it at all. The
test could complain about an unrelated CPU feature or it could even
crash in case the actual result contains no more features to go through.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 tests/cputest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cputest.c b/tests/cputest.c
index 57cff04f38..dcfdf57d43 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -605,7 +605,7 @@ cpuTestUpdateLiveCompare(virArch arch,
             (cmp > 0 &&
              featExp->policy == VIR_CPU_FEATURE_DISABLE)) {
             VIR_TEST_VERBOSE("Actual CPU has extra feature '%s'\n",
-                             featAct->name);
+                             cmp <= 0 ? featAct->name : featExp->name);
             ret = -1;
         }
     }