diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-11-25 07:12:03 -0500 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:53:18 -0500 |
| commit | c1a5d4f990ce034bcb19aebbb910c07019e60f6b (patch) | |
| tree | 23aeb993f99c0b9523486c0dcbedb61247352a45 /drivers/kvm/x86_emulate.c | |
| parent | c3c91fee5195ba5176a6da5ddc2a2822243eb79f (diff) | |
KVM: Replace #GP injection by the generalized exception queue
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/x86_emulate.c')
| -rw-r--r-- | drivers/kvm/x86_emulate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c index 3e3eba70d5ac..2e259a847697 100644 --- a/drivers/kvm/x86_emulate.c +++ b/drivers/kvm/x86_emulate.c | |||
| @@ -1779,7 +1779,7 @@ twobyte_insn: | |||
| 1779 | | ((u64)c->regs[VCPU_REGS_RDX] << 32); | 1779 | | ((u64)c->regs[VCPU_REGS_RDX] << 32); |
| 1780 | rc = kvm_set_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], msr_data); | 1780 | rc = kvm_set_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], msr_data); |
| 1781 | if (rc) { | 1781 | if (rc) { |
| 1782 | kvm_x86_ops->inject_gp(ctxt->vcpu, 0); | 1782 | kvm_inject_gp(ctxt->vcpu, 0); |
| 1783 | c->eip = ctxt->vcpu->rip; | 1783 | c->eip = ctxt->vcpu->rip; |
| 1784 | } | 1784 | } |
| 1785 | rc = X86EMUL_CONTINUE; | 1785 | rc = X86EMUL_CONTINUE; |
| @@ -1789,7 +1789,7 @@ twobyte_insn: | |||
| 1789 | /* rdmsr */ | 1789 | /* rdmsr */ |
| 1790 | rc = kvm_get_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], &msr_data); | 1790 | rc = kvm_get_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], &msr_data); |
| 1791 | if (rc) { | 1791 | if (rc) { |
| 1792 | kvm_x86_ops->inject_gp(ctxt->vcpu, 0); | 1792 | kvm_inject_gp(ctxt->vcpu, 0); |
| 1793 | c->eip = ctxt->vcpu->rip; | 1793 | c->eip = ctxt->vcpu->rip; |
| 1794 | } else { | 1794 | } else { |
| 1795 | c->regs[VCPU_REGS_RAX] = (u32)msr_data; | 1795 | c->regs[VCPU_REGS_RAX] = (u32)msr_data; |