[xen stable-4.6] x86/emul: Fix emulator test harness build following a backport of 7c508612

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen stable-4.6] x86/emul: Fix emulator test harness build following a backport of 7c508612

patchbot
commit 6a74f4e31dc28fb0d5c9e56b54d4b2aaf9b46bbe
Author:     Andrew Cooper <[hidden email]>
AuthorDate: Wed May 9 18:06:46 2018 +0100
Commit:     Andrew Cooper <[hidden email]>
CommitDate: Wed May 9 18:08:36 2018 +0100

    x86/emul: Fix emulator test harness build following a backport of 7c508612
   
    The x86 emulator doesn't need to employ any Spectre v2 mitigations.
   
    Signed-off-by: Andrew Cooper <[hidden email]>
---
 tools/tests/x86_emulator/x86_emulate.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c
index 1e67d648ad..c91d436a63 100644
--- a/tools/tests/x86_emulator/x86_emulate.c
+++ b/tools/tests/x86_emulator/x86_emulate.c
@@ -35,4 +35,9 @@ typedef bool bool_t;
 #define get_stub(stb) ((void *)((stb).addr = (uintptr_t)(stb).buf))
 #define put_stub(stb)
 
+/* No Spectre mitigations needed for the test harness. */
+asm (".macro INDIRECT_CALL arg:req\n\t"
+     "call *\\arg\n\t"
+     ".endm");
+
 #include "x86_emulate/x86_emulate.c"
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog