PC compat bug fix for 2.12

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJarBtRAAoJECgHk2+YTcWmHC4QAI/T/if6veeqnxXcyKrGKC0h
 BZMQ2K0hqRp783ijf5XdGPHy6/i1ptamr+DQ8FkSpJgvQQNXt+nfKZnsK4fTSFAU
 0lZW7L1nptjzpK/8T3v2KxzaCzsbxqJU/fX7kpNppFY0OKSfabLsEA2qYx2bEwHI
 gE4e3YXx3xP8Zes+ayWHTSn05OclwPisVTzdveKuQ6dmMCK3ktmn+HY131IFOcC0
 Fqh9poE0tab3k+mXDJnhHWQ4WacrwfzJjTPJiOo+MBdq+4n/qjgTc4dXNdHpnbK2
 tliBPtlaepvWroHgXHrwQ/PTvmPz/Zc1vEuYk0REu78SCiMWQrFPUUF4Ctb2Lo5p
 06Rcq2caPVU2VmBL1U2MJON0rRnEQTMeg++Ulo4mLhugDntWKLVan5a7CIrcrWM9
 ZTq5c9ppqzHj+3co/aI4tTMN01RoC6MNRSV7i7cxaBs4sN67PcCf6yrd2yDd8Krr
 KJFY0J2UrDKATsfmWqY5DpJHpz3CASTeDVopkIwCw18k4J33eLh1kEJji2OMvxfx
 3XCspTR/53+W7OnK33NR/eU9a43MLZgeR03FP4o0i6+oWcNxNfVoapxolTH7SiKo
 zCuR3EfnzPrHpCkJTmz1/sxUw+doX1IlR3ov8gMjDhHQ/xoLfQUWtMFgd6q0XEY5
 XqHDET+6UWJM+St2x+FJ
 =G4Hy
 -----END PGP SIGNATURE-----

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>

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",\