Commit 0e4176a1 authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: x86 emulator: Fix x86_emulate_insn() not to use the variable rc for non-X86EMUL values 



This patch makes non-X86EMUL_* family functions not to use
the variable rc.

Be sure that this changes nothing but makes the purpose of
the variable rc clearer.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 1b30eaa8

arch/x86/kvm/emulate.c

+6 −9
Original line number Diff line number Diff line
@@ -2498,9 +2498,9 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	case 0x21: /* mov from dr to reg */

		if (c->modrm_mod != 3)

			goto cannot_emulate;

		rc = emulator_get_dr(ctxt, c->modrm_reg, &c->regs[c->modrm_rm]);

		if (rc)

		if (emulator_get_dr(ctxt, c->modrm_reg, &c->regs[c->modrm_rm]))

			goto cannot_emulate;

		rc = X86EMUL_CONTINUE;

		c->dst.type = OP_NONE;	/* no writeback */

		break;

	case 0x22: /* mov reg, cr */
@@ -2513,18 +2513,16 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	case 0x23: /* mov from reg to dr */

		if (c->modrm_mod != 3)

			goto cannot_emulate;

		rc = emulator_set_dr(ctxt, c->modrm_reg,

				     c->regs[c->modrm_rm]);

		if (rc)

		if (emulator_set_dr(ctxt, c->modrm_reg, c->regs[c->modrm_rm]))

			goto cannot_emulate;

		rc = X86EMUL_CONTINUE;

		c->dst.type = OP_NONE;	/* no writeback */

		break;

	case 0x30:

		/* wrmsr */

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

			| ((u64)c->regs[VCPU_REGS_RDX] << 32);

		rc = kvm_set_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], msr_data);

		if (rc) {

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

			kvm_inject_gp(ctxt->vcpu, 0);

			c->eip = kvm_rip_read(ctxt->vcpu);

		}
@@ -2533,8 +2531,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		break;

	case 0x32:

		/* rdmsr */

		rc = kvm_get_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], &msr_data);

		if (rc) {

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

			kvm_inject_gp(ctxt->vcpu, 0);

			c->eip = kvm_rip_read(ctxt->vcpu);

		} else {