Merge commit '0af691d779965663abdd7bc708c2ad7bce2f6da0' into upstream-merge

* commit '0af691d779965663abdd7bc708c2ad7bce2f6da0':
  kvm: enable smp > 1
  kvm: validate context for kvm cpu get/put operations

Conflicts:
	target-i386/kvm.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/kvm.h b/kvm.h
index 67c039240..f316d52be 100644
--- a/kvm.h
+++ b/kvm.h
@@ -95,6 +95,10 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run);
 
 int kvm_arch_pre_run(CPUState *env, struct kvm_run *run);
 
+#ifdef KVM_UPSTREAM
+int kvm_arch_process_irqchip_events(CPUState *env);
+#endif
+
 int kvm_arch_get_registers(CPUState *env);
 
 /* state subset only touched by the VCPU itself during runtime */