From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 9 May 2018 15:25:14 +0000 (+0100)
Subject: x86/emul: Fix emulator test harness build following a91b2ec337a
X-Git-Tag: archive/raspbian/4.8.3+xsa262+shim4.10.0+comet3-1+deb9u7+rpi1^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c39827f5be760299d74aaa9bd585987d0ffe8ef0;p=xen.git

x86/emul: Fix emulator test harness build following a91b2ec337a

Versions of Xen before c/s 5c6c3ac in Xen 4.9 don't use msr-index.h for the
test harness.

Reported-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
(cherry picked from commit e017133490d35eab64c0a61bfb233162fdacccc4)


Gbp-Pq: Name x86emul-fix-emulator-test-harness-build-.patch
---

diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c
index 127a92643c..58cfd8ae7d 100644
--- a/tools/tests/x86_emulator/x86_emulate.c
+++ b/tools/tests/x86_emulator/x86_emulate.c
@@ -14,6 +14,7 @@ typedef bool bool_t;
 
 #define EFER_SCE       (1 << 0)
 #define EFER_LMA       (1 << 10)
+#define EFER_SVME      (1 << 12)
 
 #define BUG() abort()
 #define ASSERT assert