On 26.04.19 13:24, Christian Borntraeger wrote: > > > On 26.04.19 13:21, David Hildenbrand wrote: >> On 26.04.19 13:10, Christian Borntraeger wrote: >>> 8561 and 8562 will be gen15 machines. There is no name yet, lets us use >>> the cpu id as base name. Later on we can provide aliases with the proper >>> name. >>> >>> Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com> >>> --- >>> target/s390x/cpu_models.c | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c >>> index d683635eb5..dd6415103f 100644 >>> --- a/target/s390x/cpu_models.c >>> +++ b/target/s390x/cpu_models.c >>> @@ -83,6 +83,8 @@ static S390CPUDef s390_cpu_defs[] = { >>> CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"), >>> CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"), >>> CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model >>> ZR1 GA1"), >>> + CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "8561", "IBM 8561 GA1"), >>> + CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "8562", "IBM 8562 GA1"), >>> }; >>> >>> #define QEMU_MAX_CPU_TYPE 0x2827 >>> >> >> Can you fixup the comment at the beginning of the definitions, stating >> that base features of new HW are no longer a superset? >> > > Something like > > /* > * CPU definition list in order of release. Up to generation 14 base > features> * of a following release have been a superset of the previous release. With > * generation 15 two features have been deprecated. > */ >
"one base feature and one optional feature" ? -- Thanks, David / dhildenb