Merge commit '31ce5e0c49821d92fb30cce2f3055ef33613b287' into upstream-merge

* commit '31ce5e0c49821d92fb30cce2f3055ef33613b287':
  Add "broadcast" option for mce command
  Clean up cpu_inject_x86_mce()
  kvm: convert kvm_ioctl(KVM_CHECK_EXTENSION) to kvm_check_extension()
  kvm: Enable user space NMI injection for kvm guest

Conflicts:
	target-i386/kvm.c

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

1 files changed, 1 insertions, 1 deletions

diff --git a/kvm-all.c b/kvm-all.c
index e7d7f6a27..741837225 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -733,7 +733,7 @@ int kvm_init(int smp_cpus)
 
     s->broken_set_mem_region = 1;
 #ifdef KVM_CAP_JOIN_MEMORY_REGIONS_WORKS
-    ret = kvm_ioctl(s, KVM_CHECK_EXTENSION, KVM_CAP_JOIN_MEMORY_REGIONS_WORKS);
+    ret = kvm_check_extension(s, KVM_CAP_JOIN_MEMORY_REGIONS_WORKS);
     if (ret > 0) {
         s->broken_set_mem_region = 0;
     }