Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into...
commit036793aebfc1dd0ce124fa278d7668d89b5da936
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 20 Mar 2018 12:56:19 +0000 (20 12:56 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 20 Mar 2018 12:56:20 +0000 (20 12:56 +0000)
tree5379e9c3085460af6aa2665a07b2250f51c6b60f
parentd1fd31f82219c306aed7c35c370852d2f8d331a8
parentc078ca968c6c7cb62781c1843d840cb0f5c72781
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging

Machine and x86 queue, 2018-03-19

* cpu_model/cpu_type cleanups
* x86: Fix on Intel Processor Trace CPUID checks

# gpg: Signature made Mon 19 Mar 2018 20:07:14 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:
  i386: Disable Intel PT if packets IP payloads have LIP values
  cpu: drop unnecessary NULL check and cpu_common_class_by_name()
  cpu: get rid of unused cpu_init() defines
  Use cpu_create(type) instead of cpu_init(cpu_model)
  cpu: add CPU_RESOLVING_TYPE macro
  tests: add machine 'none' with -cpu test
  nios2: 10m50_devboard: replace cpu_model with cpu_type

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
target/i386/cpu.c
tests/Makefile.include
vl.c