summary refs log tree commit diff stats
path: root/ui/input-keymap.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-27 10:15:11 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-27 10:15:11 +0100
commit2dca6d9e7eb4fb25f1e41024ca20515b38bc8635 (patch)
treefe13769930b945430cf0e9b96b664eaa38cbad4b /ui/input-keymap.c
parent522fd24ca030c27c591dafedd65c1dfd51e40450 (diff)
parentbd1820227ecc0c77cc2aeba7c7c25b2d0a72ff3c (diff)
downloadfocaccia-qemu-2dca6d9e7eb4fb25f1e41024ca20515b38bc8635.tar.gz
focaccia-qemu-2dca6d9e7eb4fb25f1e41024ca20515b38bc8635.zip
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>
Diffstat (limited to 'ui/input-keymap.c')
0 files changed, 0 insertions, 0 deletions