From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 23 Sep 2013 15:37:50 +0000 (+0200)
Subject: VMX: drop memory clobbers from vmread/vmwrite wrappers
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6295
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5fc2176d9b3c5988c041fa5926fdd2da2ad560b9;p=xen.git

VMX: drop memory clobbers from vmread/vmwrite wrappers

All effects are properly being described by the asm() constraints.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jun Nakajima <jun.nakajima@intel.com>
---

diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h
index 0cb6a427ec..6f6b6728df 100644
--- a/xen/include/asm-x86/hvm/vmx/vmx.h
+++ b/xen/include/asm-x86/hvm/vmx/vmx.h
@@ -336,12 +336,11 @@ static inline void __vmread(unsigned long field, unsigned long *value)
                    UNLIKELY_END_SECTION
 #ifdef HAVE_GAS_VMX
                    : "=rm" (*value)
-                   : "r" (field)
+                   : "r" (field));
 #else
                    : "=c" (*value)
-                   : "a" (field)
+                   : "a" (field));
 #endif
-                   : "memory");
 }
 
 static inline void __vmwrite(unsigned long field, unsigned long value)
@@ -358,11 +357,10 @@ static inline void __vmwrite(unsigned long field, unsigned long value)
                    UNLIKELY_END_SECTION
                    : 
 #ifdef HAVE_GAS_VMX
-                   : "r" (field) , "rm" (value)
+                   : "r" (field) , "rm" (value));
 #else
-                   : "a" (field) , "c" (value)
+                   : "a" (field) , "c" (value));
 #endif
-                   : "memory");
 }
 
 static inline bool_t __vmread_safe(unsigned long field, unsigned long *value)
@@ -379,12 +377,11 @@ static inline bool_t __vmread_safe(unsigned long field, unsigned long *value)
                    "setnbe %0"
 #ifdef HAVE_GAS_VMX
                    : "=qm" (okay), "=rm" (*value)
-                   : "r" (field)
+                   : "r" (field));
 #else
                    : "=qm" (okay), "=c" (*value)
-                   : "a" (field)
+                   : "a" (field));
 #endif
-                   : "memory");
 
     return okay;
 }