# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID afe05231fe25ce064fc493e6287d0ffce304fe59
# Parent c270d9ffdceff31219f0610e386d311881a5869f
cmpl workaround for mmio regions
Although we don't normally expect a guest to use cmpl against a MMIO region,
this may happen due to bugs. This workaround is needed for 64 bit linux-2.6.
Signed-off-by: Chengyuan Li <chengyuan.li@xxxxxxxxx>
Signed-off-by: Arun Sharma <arun.sharma@xxxxxxxxx>
diff -r c270d9ffdcef -r afe05231fe25 xen/arch/x86/vmx_platform.c
--- a/xen/arch/x86/vmx_platform.c Mon Jul 11 08:59:58 2005
+++ b/xen/arch/x86/vmx_platform.c Mon Jul 11 09:00:12 2005
@@ -264,7 +264,7 @@
switch(mod) {
case 0:
- if (rm == 5) {
+ if (rm == 5 || rm == 4) {
if (op16)
inst = inst + 2; //disp16, skip 2 bytes
else
@@ -361,6 +361,11 @@
}
switch(*inst) {
+ case 0x81:
+ /* This is only a workaround for cmpl instruction*/
+ strcpy((char *)thread_inst->i_name, "cmp");
+ return DECODE_success;
+
case 0x88:
/* mov r8 to m8 */
thread_inst->op_size = BYTE;
@@ -633,7 +638,6 @@
__vmread(GUEST_RIP, &eip);
__vmread(INSTRUCTION_LEN, &inst_len);
-
__vmread(GUEST_RFLAGS, &eflags);
vm86 = eflags & X86_EFLAGS_VM;
@@ -735,6 +739,12 @@
inst_decoder_regs->eax, IOREQ_WRITE, 0);
return;
}
+ /* Workaround for cmp instruction */
+ if (!strncmp((char *)mmio_inst.i_name, "cmp", 3)) {
+ inst_decoder_regs->eflags &= ~X86_EFLAGS_ZF;
+ __vmwrite(GUEST_RFLAGS, inst_decoder_regs->eflags);
+ return;
+ }
domain_crash_synchronous();
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|