From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 1 Nov 2012 16:12:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=43552994c468d37d1e0e81b9f759338dcdbc5cc0;p=qemu.git

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

* qemu-kvm/uq/master: (28 commits)
  update-linux-headers.sh: Handle new kernel uapi/ directories
  target-i386: kvm_cpu_fill_host: use GET_SUPPORTED_CPUID
  target-i386: cpu: make -cpu host/check/enforce code KVM-specific
  target-i386: make cpu_x86_fill_host() void
  Emulate qemu-kvms -no-kvm option
  Issue warning when deprecated -tdf option is used
  Issue warning when deprecated drive parameter boot=on|off is used
  Use global properties to emulate -no-kvm-pit-reinjection
  Issue warning when deprecated -no-kvm-pit is used
  Use machine options to emulate -no-kvm-irqchip
  cirrus_vga: allow configurable vram size
  target-i386: Add missing kvm cpuid feature name
  i386: cpu: add missing CPUID[EAX=7,ECX=0] flag names
  i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too
  i386: kvm: reformat filter_features_for_kvm() code
  i386: kvm: filter CPUID feature words earlier, on cpu.c
  i386: kvm: mask cpuid_ext4_features bits earlier
  i386: kvm: mask cpuid_kvm_features earlier
  i386: kvm: x2apic is not supported without in-kernel irqchip
  i386: kvm: set CPUID_EXT_TSC_DEADLINE_TIMER on kvm_arch_get_supported_cpuid()
  ...

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

43552994c468d37d1e0e81b9f759338dcdbc5cc0
diff --cc target-i386/cpu.c
index 156e9199ed,4c84e9fbc4..c46286ab3e
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@@ -1432,10 -1469,13 +1476,14 @@@ int cpu_x86_register(X86CPU *cpu, cons
              );
          env->cpuid_ext3_features &= TCG_EXT3_FEATURES;
          env->cpuid_svm_features &= TCG_SVM_FEATURES;
+     } else {
+ #ifdef CONFIG_KVM
+         filter_features_for_kvm(cpu);
+ #endif
      }
      object_property_set_str(OBJECT(cpu), def->model_id, "model-id", &error);
 -    if (error_is_set(&error)) {
 +    if (error) {
 +        fprintf(stderr, "%s\n", error_get_pretty(error));
          error_free(error);
          return -1;
      }