From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 6 Feb 2014 23:51:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kvm/uq/master' into staging
X-Git-Tag: qemu-xen-4.5.0-rc1~227
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bc1c72171ceb9a817138603fe381d64e7f8a9364;p=qemu-upstream-4.5-testing.git

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

* remotes/kvm/uq/master:
  target-i386: Move KVM default-vendor hack to instance_init
  target-i386: Don't change x86_def_t struct on cpu_x86_register()
  target-i386: Eliminate CONFIG_KVM #ifdefs
  kvm: add support for hyper-v timers
  kvm: make hyperv vapic assist page migratable
  kvm: make hyperv hypercall and guest os id MSRs migratable.
  kvm: make availability of Hyper-V enlightenments dependent on KVM_CAP_HYPERV
  KVM: fix coexistence of KVM and Hyper-V leaves
  kvm: print suberror on all internal errors
  target-i386: kvm_check_features_against_host(): Kill feature word array
  target-i386: kvm_cpu_fill_host(): Fill feature words in a loop
  target-i386: kvm_cpu_fill_host(): Set all feature words at end of function
  target-i386: kvm_cpu_fill_host(): No need to check xlevel2
  target-i386: kvm_cpu_fill_host(): No need to check CPU vendor
  target-i386: kvm_cpu_fill_host(): No need to check level
  target-i386: kvm_cpu_fill_host(): Kill unused code

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

bc1c72171ceb9a817138603fe381d64e7f8a9364