Merge remote branch 'qemu-kvm/uq/master' into staging

aliguori: fix build with !defined(KVM_CAP_ASYNC_PF)

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --cc configure
Simple merge

diff --cc hmp-commands.hx
Simple merge

diff --cc kvm-all.c
Simple merge

diff --cc monitor.c
Simple merge

diff --cc target-i386/kvm.c
index 7dfc357e42f92222da2680bf4a41a8f5d7b6806d,8e8880a92b38f44c6af43be923e6028b79fdb2e0..05010bbc38dd790ec7719954eaecfeec7a6bf359
--- 1/target-i386/kvm.c
--- 2/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@@ -170,14 -160,15 +160,17 @@@ struct kvm_para_features 
  
  static int get_para_features(CPUState *env)
  {
-         int i, features = 0;
+     int i, features = 0;
  
-         for (i = 0; i < ARRAY_SIZE(para_features) - 1; i++) {
-                 if (kvm_check_extension(env->kvm_state, para_features[i].cap))
-                         features |= (1 << para_features[i].feature);
+     for (i = 0; i < ARRAY_SIZE(para_features) - 1; i++) {
+         if (kvm_check_extension(env->kvm_state, para_features[i].cap)) {
+             features |= (1 << para_features[i].feature);
          }
- 
-         return features;
+     }
++#ifdef KVM_CAP_ASYNC_PF
+     has_msr_async_pf_en = features & (1 << KVM_FEATURE_ASYNC_PF);
++#endif
+     return features;
  }
  #endif
  

diff --cc vl.c
Simple merge