diff options
| author | Peter Maydell | 2018-03-17 13:11:08 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-03-17 13:11:08 +0100 |
| commit | 979454028cf93e5ef340569c616f477fa7c8630a (patch) | |
| tree | 9fc7ae09ab5345176f97dbdb6d59e2f8dbab91ec /include | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180316' into staging (diff) | |
| parent | pc: correct misspelled CPU model-id for pc 2.2 (diff) | |
| download | qemu-979454028cf93e5ef340569c616f477fa7c8630a.tar.gz qemu-979454028cf93e5ef340569c616f477fa7c8630a.tar.xz qemu-979454028cf93e5ef340569c616f477fa7c8630a.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
PC compat bug fix for 2.12
# gpg: Signature made Fri 16 Mar 2018 19:30:25 GMT
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
pc: correct misspelled CPU model-id for pc 2.2
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 6598d571a0..ffee8413f0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -601,7 +601,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); #define PC_COMPAT_2_2 \ HW_COMPAT_2_2 \ - PC_CPU_MODEL_IDS("2.3.0") \ + PC_CPU_MODEL_IDS("2.2.0") \ {\ .driver = "kvm64" "-" TYPE_X86_CPU,\ .property = "vme",\ |