From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 1 Mar 2024 20:52:15 +0000 (+0000)
Subject: xsa-170/196: Update to avoid using test_wants_user_mappings
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9367e917582ffab4abb69944bb4c0657c5d30300;p=xtf.git

xsa-170/196: Update to avoid using test_wants_user_mappings

The capability is going away.  Move stubs into .text.user.

No change in test behaviour.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/tests/xsa-170/main.c b/tests/xsa-170/main.c
index 9b79e02..3351a2e 100644
--- a/tests/xsa-170/main.c
+++ b/tests/xsa-170/main.c
@@ -24,10 +24,9 @@
 
 const char test_title[] = "XSA-170 PoC";
 
-bool test_wants_user_mappings = true;
 bool test_needs_fep = true;
 
-void wild_jump(void)
+static void __user_text wild_jump(void)
 {
     /*
      * After XSA-170, Xen's instruction emulator was improved to perform a
@@ -42,7 +41,7 @@ void wild_jump(void)
                   :: "rm" (0x8000000000000000ULL));
 }
 
-void nop_slide(void)
+static void __user_text nop_slide(void)
 {
     /*
      * AMD hardware can correctly re-enter the guest with a non-canonical
diff --git a/tests/xsa-196/main.c b/tests/xsa-196/main.c
index f50c333..3817e46 100644
--- a/tests/xsa-196/main.c
+++ b/tests/xsa-196/main.c
@@ -26,7 +26,6 @@
 
 const char test_title[] = "XSA-196 PoC";
 
-bool test_wants_user_mappings = true;
 bool test_needs_fep = true;
 
 void custom_doublefault_handler(void);
@@ -42,7 +41,7 @@ static const struct xtf_idte idte = {
     .cs   = __KERN_CS,
 };
 
-unsigned long compat_userspace(void)
+static unsigned long __user_text compat_userspace(void)
 {
     exinfo_t fault = 0;