From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 28 Apr 2017 14:03:40 +0000 (+0200)
Subject: x86emul: correct stub invocation constraints again
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2189
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba39e9b2108319d2b7b842781106386b8ed62fab;p=xen.git

x86emul: correct stub invocation constraints again

While the hypervisor side of commit cd91ab08ea ("x86emul: correct stub
invocation constraints") was fine, the tools side triggered a bogus
error with old gcc (4.3 and 4.4 at least). Use a slightly less
appropriate variant instead, proven to be good enough to not
re-introduce the original problem: Which of the addresses is actually
used doesn't matter much as long as the compiler can't prove that the
two pointers don't alias one another.

Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Release-acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c
index a695d5a49d..8a3071590f 100644
--- a/xen/arch/x86/x86_emulate/x86_emulate.c
+++ b/xen/arch/x86/x86_emulate/x86_emulate.c
@@ -855,7 +855,7 @@ do{ asm volatile (                                                      \
 # define invoke_stub(pre, post, constraints...)                         \
     asm volatile ( pre "\n\tcall *%[stub]\n\t" post                     \
                    : constraints, [stub] "rm" (stub.func),              \
-                     "m" (*(uint8_t(*)[MAX_INST_LEN + 1])stub.buf) )
+                     "m" (*(typeof(stub.buf) *)stub.addr) )
 #endif
 
 #define emulate_stub(dst, src...) do {                                  \