Merge commit 'c0532a76b407af4b276dc5a62d8178db59857ea6' into upstream-merge

* commit 'c0532a76b407af4b276dc5a62d8178db59857ea6':
  MCE: Relay UCR MCE to guest

Conflicts:
	kvm-stub.c
	target-i386/kvm.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/kvm.h b/kvm.h
index 85e85aa29..02280a68b 100644
--- a/kvm.h
+++ b/kvm.h
@@ -118,6 +118,9 @@ int kvm_arch_init_vcpu(CPUState *env);
 
 void kvm_arch_reset_vcpu(CPUState *env);
 
+int kvm_on_sigbus_vcpu(CPUState *env, int code, void *addr);
+int kvm_on_sigbus(int code, void *addr);
+
 struct kvm_guest_debug;
 struct kvm_debug_exit_arch;