From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 29 Jul 2013 16:33:34 +0000 (-0500)
Subject: Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
X-Git-Tag: v1.6.0-rc0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ff1fac4305f78d9cf987ca8abf3bda7f29c856e;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging

QOM CPUState refactorings

* Fix x86 cpu-add
* Change KVM PMU behavior for 1.6

# gpg: Signature made Mon 29 Jul 2013 10:28:18 AM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Eduardo Habkost (2) and Andreas Färber (1)
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
  target-i386: Disable PMU CPUID leaf by default
  target-i386: Pass X86CPU object to cpu_x86_find_by_name()
  cpu: Partially revert "cpu: Change qemu_init_vcpu() argument to CPUState"
---

4ff1fac4305f78d9cf987ca8abf3bda7f29c856e