From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 27 Jul 2017 09:15:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X-Git-Tag: v2.10.0-rc1~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2dca6d9e7eb4fb25f1e41024ca20515b38bc8635;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging

x86 bug fix for -rc1

Fix for a bug in "-cpu max" that breaks libvirt usage of
query-cpu-model-expansion.

# gpg: Signature made Wed 26 Jul 2017 19:35:28 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# 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/x86-pull-request:
  target/i386: Don't use x86_cpu_load_def() on "max" CPU model
  target/i386: Define CPUID_MODEL_ID_SZ macro
  target/i386: Use host_vendor_fms() in max_x86_cpu_initfn()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

2dca6d9e7eb4fb25f1e41024ca20515b38bc8635