diff options
| author |   Peter Maydell <peter.maydell@linaro.org> | 2014-11-04 15:54:27 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-11-04 15:56:26 +0000 |
| commit | 2bb41e5d307a819789f3bab719419ac7b77e6f80 (patch) | |
| tree | 8be67308ba4327b3e61e48aa3e6db9f6dd21fb41 /scripts/switch-timer-api | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141104-2' into staging (diff) | |
| parent | target-i386: Disable SVM by default in KVM mode (diff) | |
| download | qemu-2bb41e5d307a819789f3bab719419ac7b77e6f80.tar.xz qemu-2bb41e5d307a819789f3bab719419ac7b77e6f80.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into staging
QOM CPUState and X86CPU
* Cleanups for -cpu ...,enforce
* remotes/afaerber/tags/qom-cpu-for-peter:
target-i386: Disable SVM by default in KVM mode
target-i386: Don't enable nested VMX by default
target-i386: Remove unsupported bits from all CPU models
target-i386: Disable CPUID_ACPI by default in KVM mode
target-i386: Rename KVM auto-feature-enable compat function
pc: Create pc_compat_2_1() functions
Conflicts:
hw/i386/pc_piix.c
hw/i386/pc_q35.c
[PMM: Fixed minor textual conflicts]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/switch-timer-api')
0 files changed, 0 insertions, 0 deletions