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

Commit 231e58e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm 

* 'kvm-updates/3.1' of git://github.com/avikivity/kvm:
  KVM: x86 emulator: fix Src2CL decode
  KVM: MMU: fix incorrect return of spte
parents a2b49102 9be3be1f

arch/x86/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -3603,7 +3603,7 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len) 
		break;

	case Src2CL:

		ctxt->src2.bytes = 1;

		ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0x8;

		ctxt->src2.val = ctxt->regs[VCPU_REGS_RCX] & 0xff;

		break;

	case Src2ImmByte:

		rc = decode_imm(ctxt, &ctxt->src2, 1, true);

arch/x86/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -400,7 +400,8 @@ static u64 __update_clear_spte_slow(u64 *sptep, u64 spte) 


	/* xchg acts as a barrier before the setting of the high bits */

	orig.spte_low = xchg(&ssptep->spte_low, sspte.spte_low);

	orig.spte_high = ssptep->spte_high = sspte.spte_high;

	orig.spte_high = ssptep->spte_high;

	ssptep->spte_high = sspte.spte_high;

	count_spte_clear(sptep, spte);



	return orig.spte;