Commit 97945402 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2bb39a65 0ab126f1

include/hw/i386/pc.h

+1 −1
Original line number Diff line number Diff line
@@ -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",\