From: Peter Maydell Date: Mon, 6 Jan 2020 14:08:04 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6fb0dae9efa90c2ef41d8aacef296b8959cf1d61;p=qemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging x86 and machine queue, 2019-12-20 Bug fix: * Resolve CPU models to v1 by default (Eduardo Habkost) Cleanup: * Remove incorrect numa_mem_supported checks (Igor Mammedov) # gpg: Signature made Fri 20 Dec 2019 19:19:02 GMT # gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6 # gpg: issuer "ehabkost@redhat.com" # gpg: Good signature from "Eduardo Habkost " [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-and-machine-pull-request: numa: properly check if numa is supported numa: remove not needed check i386: Resolve CPU models to v1 by default Signed-off-by: Peter Maydell --- 6fb0dae9efa90c2ef41d8aacef296b8959cf1d61