diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 11:33:34 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 11:33:34 -0500 |
| commit | 4ff1fac4305f78d9cf987ca8abf3bda7f29c856e (patch) | |
| tree | 6924734408a2617a5025e57c1f436a634ce68c1d /include | |
| parent | 3a1da42eb35a67d0dbc899dd571ea386fa11c4dd (diff) | |
| parent | 9337e3b6e1d779215423d9b419d42200506deaab (diff) | |
| download | qemu-4ff1fac4305f78d9cf987ca8abf3bda7f29c856e.tar.gz | |
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"
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 7fb97b08a2..09c2dd411b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -235,6 +235,10 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); .driver = "virtio-net-pci",\ .property = "any_layout",\ .value = "off",\ + },{\ + .driver = TYPE_X86_CPU,\ + .property = "pmu",\ + .value = "on",\ } #define PC_COMPAT_1_4 \ |