Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd525365 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: x86 emulator: do not call writeback if msr access fails. 



Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 2e901c4c

arch/x86/kvm/emulate.c

+2 −2
Original line number Diff line number Diff line
@@ -2563,7 +2563,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
			| ((u64)c->regs[VCPU_REGS_RDX] << 32);

		if (kvm_set_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], msr_data)) {

			kvm_inject_gp(ctxt->vcpu, 0);

			c->eip = ctxt->eip;

			goto done;

		}

		rc = X86EMUL_CONTINUE;

		c->dst.type = OP_NONE;
@@ -2572,7 +2572,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		/* rdmsr */

		if (kvm_get_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], &msr_data)) {

			kvm_inject_gp(ctxt->vcpu, 0);

			c->eip = ctxt->eip;

			goto done;

		} else {

			c->regs[VCPU_REGS_RAX] = (u32)msr_data;

			c->regs[VCPU_REGS_RDX] = msr_data >> 32;