Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (145 commits)
  KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
  KVM: VMX: Update instruction length on intercepted BP
  KVM: Fix emulate_sys[call, enter, exit]()'s fault handling
  KVM: Fix segment descriptor loading
  KVM: Fix load_guest_segment_descriptor() to inject page fault
  KVM: x86 emulator: Forbid modifying CS segment register by mov instruction
  KVM: Convert kvm->requests_lock to raw_spinlock_t
  KVM: Convert i8254/i8259 locks to raw_spinlocks
  KVM: x86 emulator: disallow opcode 82 in 64-bit mode
  KVM: x86 emulator: code style cleanup
  KVM: Plan obsolescence of kernel allocated slots, paravirt mmu
  KVM: x86 emulator: Add LOCK prefix validity checking
  KVM: x86 emulator: Check CPL level during privilege instruction emulation
  KVM: x86 emulator: Fix popf emulation
  KVM: x86 emulator: Check IOPL level during io instruction emulation
  KVM: x86 emulator: fix memory access during x86 emulation
  KVM: x86 emulator: Add Virtual-8086 mode of emulation
  KVM: x86 emulator: Add group9 instruction decoding
  KVM: x86 emulator: Add group8 instruction decoding
  KVM: do not store wqh in irqfd
  ...

Trivial conflicts in Documentation/feature-removal-schedule.txt

1 files changed, 11 insertions, 9 deletions

diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
index ff3cb63b8117..2570fcc7665d 100644
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -439,7 +439,7 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws)
         struct kvmppc_44x_tlbe *tlbe;
         unsigned int gtlb_index;
 
-        gtlb_index = vcpu->arch.gpr[ra];
+        gtlb_index = kvmppc_get_gpr(vcpu, ra);
         if (gtlb_index > KVM44x_GUEST_TLB_SIZE) {
                 printk("%s: index %d\n", __func__, gtlb_index);
                 kvmppc_dump_vcpu(vcpu);
@@ -455,15 +455,15 @@ int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws)
         switch (ws) {
         case PPC44x_TLB_PAGEID:
                 tlbe->tid = get_mmucr_stid(vcpu);
-                tlbe->word0 = vcpu->arch.gpr[rs];
+                tlbe->word0 = kvmppc_get_gpr(vcpu, rs);
                 break;
 
         case PPC44x_TLB_XLAT:
-                tlbe->word1 = vcpu->arch.gpr[rs];
+                tlbe->word1 = kvmppc_get_gpr(vcpu, rs);
                 break;
 
         case PPC44x_TLB_ATTRIB:
-                tlbe->word2 = vcpu->arch.gpr[rs];
+                tlbe->word2 = kvmppc_get_gpr(vcpu, rs);
                 break;
 
         default:
@@ -500,18 +500,20 @@ int kvmppc_44x_emul_tlbsx(struct kvm_vcpu *vcpu, u8 rt, u8 ra, u8 rb, u8 rc)
         unsigned int as = get_mmucr_sts(vcpu);
         unsigned int pid = get_mmucr_stid(vcpu);
 
-        ea = vcpu->arch.gpr[rb];
+        ea = kvmppc_get_gpr(vcpu, rb);
         if (ra)
-                ea += vcpu->arch.gpr[ra];
+                ea += kvmppc_get_gpr(vcpu, ra);
 
         gtlb_index = kvmppc_44x_tlb_index(vcpu, ea, pid, as);
         if (rc) {
+                u32 cr = kvmppc_get_cr(vcpu);
+
                 if (gtlb_index < 0)
-                        vcpu->arch.cr &= ~0x20000000;
+                        kvmppc_set_cr(vcpu, cr & ~0x20000000);
                 else
-                        vcpu->arch.cr |= 0x20000000;
+                        kvmppc_set_cr(vcpu, cr | 0x20000000);
         }
-        vcpu->arch.gpr[rt] = gtlb_index;
+        kvmppc_set_gpr(vcpu, rt, gtlb_index);
 
         kvmppc_set_exit_type(vcpu, EMULATED_TLBSX_EXITS);
         return EMULATE_DONE;