From: Naphtali Sprei <nsp...@redhat.com>
use correct 64 bit mode inline assembly constraints
use a canonical form address when writing to the MSR_KERNEL_GS_BASE MSR
Signed-off-by: Naphtali Sprei <nsp...@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosa...@redhat.com>
diff --git a/kvm/user/test/x86/msr.c b/kvm/user/test/x86/msr.c
index 92102fa..0d6f286 100644
--- a/kvm/user/test/x86/msr.c
+++ b/kvm/user/test/x86/msr.c
@@ -17,23 +17,25 @@ static void report(const char *name, int passed)
static void wrmsr(unsigned index, unsigned long long value)
{
- asm volatile ("wrmsr" : : "c"(index), "A"(value));
+ unsigned a = value, d = value >> 32;
+
+ asm volatile("wrmsr" : : "a"(a), "d"(d), "c"(index));
}
static unsigned long long rdmsr(unsigned index)
{
- unsigned long long value;
-
- asm volatile ("rdmsr" : "=A"(value) : "c"(index));
+ unsigned a, d;
- return value;
+ asm volatile("rdmsr" : "=a"(a), "=d"(d) : "c"(index));
+ return ((unsigned long long)d << 32) | a;
}
+
#endif
static void test_kernel_gs_base(void)
{
#ifdef __x86_64__
- unsigned long long v1 = 0x123456789abcdef, v2;
+ unsigned long long v1 = 0x0000123456789abc, v2;
wrmsr(MSR_KERNEL_GS_BASE, v1);
v2 = rdmsr(MSR_KERNEL_GS_BASE);
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
