diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-20 12:56:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-20 12:56:20 +0000 |
| commit | 036793aebfc1dd0ce124fa278d7668d89b5da936 (patch) | |
| tree | 5379e9c3085460af6aa2665a07b2250f51c6b60f /target/s390x/cpu.h | |
| parent | d1fd31f82219c306aed7c35c370852d2f8d331a8 (diff) | |
| parent | c078ca968c6c7cb62781c1843d840cb0f5c72781 (diff) | |
| download | qemu-036793aebfc1dd0ce124fa278d7668d89b5da936.zip qemu-036793aebfc1dd0ce124fa278d7668d89b5da936.tar.gz qemu-036793aebfc1dd0ce124fa278d7668d89b5da936.tar.bz2 | |
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>
Diffstat (limited to 'target/s390x/cpu.h')
| -rw-r--r-- | target/s390x/cpu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 5f357a4..3ee40f0 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -719,10 +719,9 @@ void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga, /* helper.c */ -#define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model) - #define S390_CPU_TYPE_SUFFIX "-" TYPE_S390_CPU #define S390_CPU_TYPE_NAME(name) (name S390_CPU_TYPE_SUFFIX) +#define CPU_RESOLVING_TYPE TYPE_S390_CPU /* you can call this signal handler from your SIGBUS and SIGSEGV signal handlers to inform the virtual CPU of exceptions. non zero |