Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

* 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (75 commits)
  KVM: SVM: Keep intercepting task switching with NPT enabled
  KVM: s390: implement sigp external call
  KVM: s390: fix register setting
  KVM: s390: fix return value of kvm_arch_init_vm
  KVM: s390: check cpu_id prior to using it
  KVM: emulate lapic tsc deadline timer for guest
  x86: TSC deadline definitions
  KVM: Fix simultaneous NMIs
  KVM: x86 emulator: convert push %sreg/pop %sreg to direct decode
  KVM: x86 emulator: switch lds/les/lss/lfs/lgs to direct decode
  KVM: x86 emulator: streamline decode of segment registers
  KVM: x86 emulator: simplify OpMem64 decode
  KVM: x86 emulator: switch src decode to decode_operand()
  KVM: x86 emulator: qualify OpReg inhibit_byte_regs hack
  KVM: x86 emulator: switch OpImmUByte decode to decode_imm()
  KVM: x86 emulator: free up some flag bits near src, dst
  KVM: x86 emulator: switch src2 to generic decode_operand()
  KVM: x86 emulator: expand decode flags to 64 bits
  KVM: x86 emulator: split dst decode to a generic decode_operand()
  KVM: x86 emulator: move memop, memopp into emulation context
  ...

1 files changed, 7 insertions, 0 deletions

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 00ff00dfb24c..1ca5de07ac36 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -119,6 +119,7 @@ struct kvm_vcpu_stat {
         u32 instruction_lctlg;
         u32 exit_program_interruption;
         u32 exit_instr_and_program;
+        u32 deliver_external_call;
         u32 deliver_emergency_signal;
         u32 deliver_service_signal;
         u32 deliver_virtio_interrupt;
@@ -138,6 +139,7 @@ struct kvm_vcpu_stat {
         u32 instruction_stfl;
         u32 instruction_tprot;
         u32 instruction_sigp_sense;
+        u32 instruction_sigp_external_call;
         u32 instruction_sigp_emergency;
         u32 instruction_sigp_stop;
         u32 instruction_sigp_arch;
@@ -174,6 +176,10 @@ struct kvm_s390_prefix_info {
         __u32 address;
 };
 
+struct kvm_s390_extcall_info {
+        __u16 code;
+};
+
 struct kvm_s390_emerg_info {
         __u16 code;
 };
@@ -186,6 +192,7 @@ struct kvm_s390_interrupt_info {
                 struct kvm_s390_ext_info ext;
                 struct kvm_s390_pgm_info pgm;
                 struct kvm_s390_emerg_info emerg;
+                struct kvm_s390_extcall_info extcall;
                 struct kvm_s390_prefix_info prefix;
         };
 };