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

* qemu-kvm/uq/master:
  target-i386: kvm: prevent buffer overflow if -cpu foo, [x]level is too big
  vmxcap: bit 9 of VMX_PROCBASED_CTLS2 is 'virtual interrupt delivery'

Conflicts:
	target-i386/kvm.c

Trivial merge resolution due to lack of context.

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

diff --cc target-i386/kvm.c
index c440809cb2890c1364c8ed3185af863cd06164ef,4ecb728a5d7be5058234f4638b54316f02a5cb8e..9ebf1816d99f7adb9968309bdd08eab5f370750b
--- 1/target-i386/kvm.c
--- 2/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@@ -411,12 -411,7 +411,14 @@@ static void cpu_update_state(void *opaq
      }
  }
  
 +unsigned long kvm_arch_vcpu_id(CPUState *cs)
 +{
 +    X86CPU *cpu = X86_CPU(cs);
 +    return cpu->env.cpuid_apic_id;
 +}
 +
+ #define KVM_MAX_CPUID_ENTRIES  100
++
  int kvm_arch_init_vcpu(CPUState *cs)
  {
      struct {