openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390x/cpumodel: add z14 GA2 model 

Introduce the z14 GA2 cpu model for QEMU. There are no new features
introduced with this model, and will inherit the same feature set as
z14 GA1.

Signed-off-by: Collin Walling <walling@linux.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20190212011657.18324-3-walling@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Collin Walling 2019-02-11 20:16:57 -05:00 committed by Cornelia Huck
parent 84176c7906
commit f2a7d15771
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/s390x/cpu_models.c
View File

@ -79,6 +79,7 @@ static S390CPUDef s390_cpu_defs[] = {
CPUDEF_INIT(0x2964, 13, 2, 47, 0x08000000U, "z13.2", "IBM z13 GA2"), CPUDEF_INIT(0x2964, 13, 2, 47, 0x08000000U, "z13.2", "IBM z13 GA2"),
CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"), CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"),
CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"), 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(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
}; };

7
target/s390x/gen-features.c
View File

@ -353,6 +353,8 @@ static uint16_t base_GEN14_GA1[] = {
S390_FEAT_ORDER_PRESERVING_COMPRESSION, S390_FEAT_ORDER_PRESERVING_COMPRESSION,
}; };
#define base_GEN14_GA2 EmptyFeat
/* Full features (in order of release) /* Full features (in order of release)
* Automatically includes corresponding base features. * Automatically includes corresponding base features.
* Full features are all features this hardware supports even if kvm/QEMU do not * Full features are all features this hardware supports even if kvm/QEMU do not
@ -480,6 +482,8 @@ static uint16_t full_GEN14_GA1[] = {
S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,
}; };
#define full_GEN14_GA2 EmptyFeat
/* Default features (in order of release) /* Default features (in order of release)
* Automatically includes corresponding base features. * Automatically includes corresponding base features.
* Default features are all features this version of QEMU supports for this * Default features are all features this version of QEMU supports for this
@ -554,6 +558,8 @@ static uint16_t default_GEN14_GA1[] = {
S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,
}; };
#define default_GEN14_GA2 EmptyFeat
/* QEMU (CPU model) features */ /* QEMU (CPU model) features */
static uint16_t qemu_V2_11[] = { static uint16_t qemu_V2_11[] = {
@ -664,6 +670,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
CPU_FEAT_INITIALIZER(GEN13_GA1), CPU_FEAT_INITIALIZER(GEN13_GA1),
CPU_FEAT_INITIALIZER(GEN13_GA2), CPU_FEAT_INITIALIZER(GEN13_GA2),
CPU_FEAT_INITIALIZER(GEN14_GA1), CPU_FEAT_INITIALIZER(GEN14_GA1),
CPU_FEAT_INITIALIZER(GEN14_GA2),
}; };
#define FEAT_GROUP_INITIALIZER(_name) \ #define FEAT_GROUP_INITIALIZER(_name) \