diff mbox

[kvm-unit-tests] vmx: correctly set up MONITOR and MWAIT

Message ID 1493309532-14398-1-git-send-email-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paolo Bonzini April 27, 2017, 4:12 p.m. UTC 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 x86/vmx_tests.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index 1766af3..43d1f5b 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -733,7 +733,7 @@  static int iobmp_exit_handler()
 asm(
 	"insn_hlt: hlt;ret\n\t"
 	"insn_invlpg: invlpg 0x12345678;ret\n\t"
-	"insn_mwait: mwait;ret\n\t"
+	"insn_mwait: xor %eax, %eax; xor %ecx, %ecx; mwait;ret\n\t"
 	"insn_rdpmc: xor %ecx, %ecx; rdpmc;ret\n\t"
 	"insn_rdtsc: rdtsc;ret\n\t"
 	"insn_cr3_load: mov cr3,%rax; mov %rax,%cr3;ret\n\t"
@@ -742,7 +742,7 @@  asm(
 	"insn_cr8_load: mov %rax,%cr8;ret\n\t"
 	"insn_cr8_store: mov %cr8,%rax;ret\n\t"
 #endif
-	"insn_monitor: monitor;ret\n\t"
+	"insn_monitor: xor %eax, %eax; xor %ecx, %ecx; xor %edx, %edx; monitor;ret\n\t"
 	"insn_pause: pause;ret\n\t"
 	"insn_wbinvd: wbinvd;ret\n\t"
 	"insn_cpuid: mov $10, %eax; cpuid;ret\n\t"