aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorMohammed Gamal <m.gamal005@gmail.com>2010-08-08 14:11:38 -0400
committerAvi Kivity <avi@redhat.com>2010-10-24 04:51:04 -0400
commit8c5eee30a942cb3154f14f12407755ed7da74bbc (patch)
tree3926ca1ef05fd2293fd3412802915b7b9cf4da55 /arch/x86/kvm
parent3f9f53b0d599aabb03db35208fb31768568ca83f (diff)
KVM: x86 emulator: Fix emulate_grp3 return values
This patch lets emulate_grp3() return X86EMUL_* return codes instead of hardcoded ones. Signed-off-by: Mohammed Gamal <m.gamal005@gmail.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/emulate.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index f0415eab6591..8617c344405d 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1424,9 +1424,9 @@ static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
1424 emulate_1op_rax_rdx("idiv", c->src, *rax, *rdx, ctxt->eflags); 1424 emulate_1op_rax_rdx("idiv", c->src, *rax, *rdx, ctxt->eflags);
1425 break; 1425 break;
1426 default: 1426 default:
1427 return 0; 1427 return X86EMUL_UNHANDLEABLE;
1428 } 1428 }
1429 return 1; 1429 return X86EMUL_CONTINUE;
1430} 1430}
1431 1431
1432static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt, 1432static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt,
@@ -3172,7 +3172,7 @@ special_insn:
3172 ctxt->eflags ^= EFLG_CF; 3172 ctxt->eflags ^= EFLG_CF;
3173 break; 3173 break;
3174 case 0xf6 ... 0xf7: /* Grp3 */ 3174 case 0xf6 ... 0xf7: /* Grp3 */
3175 if (!emulate_grp3(ctxt, ops)) 3175 if (emulate_grp3(ctxt, ops) != X86EMUL_CONTINUE)
3176 goto cannot_emulate; 3176 goto cannot_emulate;
3177 break; 3177 break;
3178 case 0xf8: /* clc */ 3178 case 0xf8: /* clc */