From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 19 Apr 2017 11:30:27 +0000 (+0200)
Subject: x86emul: force CLZERO feature flag in test harness
X-Git-Tag: 4.9.0-rc2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5d1ad47ff7940d95c322667678a190c8607754b4;p=xen.git

x86emul: force CLZERO feature flag in test harness

Commit b988e88cc0 ("x86/emul: Add feature check for clzero") added a
feature check to the emulator, which breaks the harness without this
flag being forced to true.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Julien Grall <julien.grall@arm.com>
---

diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c
index cea0595ae2..79661d5c2b 100644
--- a/tools/tests/x86_emulator/x86_emulate.c
+++ b/tools/tests/x86_emulator/x86_emulate.c
@@ -89,6 +89,13 @@ int emul_test_cpuid(
         res->c |= 1U << 22;
     }
 
+    /*
+     * The emulator doesn't itself use CLZERO, so we can always run the
+     * respective test(s).
+     */
+    if ( leaf == 0x80000008 )
+        res->b |= 1U << 0;
+
     return X86EMUL_OKAY;
 }