[xen master] x86/emul: Fix test harness build with blk.c moved out of x86_emulate.c

[patchbot@xxxxxxx]

commit bfa2e6a246225233f09a2523939e01dcf83bca4c
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Mon Apr 3 13:17:35 2023 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Apr 3 13:33:19 2023 +0100

    x86/emul: Fix test harness build with blk.c moved out of x86_emulate.c
    
    Trying to build the test harness fails with:
    
      x86_emulate/blk.c: In function 'x86_emul_blk':
      x86_emulate/blk.c:74:15: error: expected ':' or ')' before 'ASM_FLAG_OUT'
         74 |               ASM_FLAG_OUT(, "; setz %[zf]")
            |               ^~~~~~~~~~~~
    
    This is because ASM_FLAG_OUT() is still local to x86_emulate.c.  Move it 
into
    x86-emulate.h instead so it ends up in all files including private.h.  The
    main Xen build gets this macro from compiler.h.
    
    Fixes: c80243f94386 ("x86emul: move x86_emul_blk() to separate source file")
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 tools/tests/x86_emulator/x86-emulate.h | 6 ++++++
 xen/arch/x86/x86_emulate/x86_emulate.c | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/tests/x86_emulator/x86-emulate.h 
b/tools/tests/x86_emulator/x86-emulate.h
index 0ae528a741..942b4cdd47 100644
--- a/tools/tests/x86_emulator/x86-emulate.h
+++ b/tools/tests/x86_emulator/x86-emulate.h
@@ -65,6 +65,12 @@
 #define AC_(n,t) (n##t)
 #define _AC(n,t) AC_(n,t)
 
+#ifdef __GCC_ASM_FLAG_OUTPUTS__
+# define ASM_FLAG_OUT(yes, no) yes
+#else
+# define ASM_FLAG_OUT(yes, no) no
+#endif
+
 #define hweight32 __builtin_popcount
 #define hweight64 __builtin_popcountll
 
diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c 
b/xen/arch/x86/x86_emulate/x86_emulate.c
index b84e9ee54d..5a0ec5900a 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -132,12 +132,6 @@ static const uint8_t sse_prefix[] = { 0x66, 0xf3, 0xf2 };
         (void *)(((long)__##var + __alignof(type) - __alignof(__##var))   \
                  & -__alignof(type))
 
-#ifdef __GCC_ASM_FLAG_OUTPUTS__
-# define ASM_FLAG_OUT(yes, no) yes
-#else
-# define ASM_FLAG_OUT(yes, no) no
-#endif
-
 /* MXCSR bit definitions. */
 #define MXCSR_MM  (1U << 17)
 
--
generated by git-patchbot for /home/xen/git/xen.git#master