From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 29 Jan 2013 22:57:41 +0000 (-0600)
Subject: Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~2697
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0893d46014b0300fb8aec92df94effea34d04b61;p=sdk%2Femulator%2Fqemu.git

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>
---

0893d46014b0300fb8aec92df94effea34d04b61
diff --cc target-i386/kvm.c
index c440809,4ecb728..9ebf181
--- a/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 {