mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-25 03:43:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

s390x: Bump the "qemu" CPU model up to a stripped-down z13

Browse Source 
We don't care about the other two missing base features:
- S390_FEAT_DFP_PACKED_CONVERSION
- S390_FEAT_GROUP_GEN13_PTFF

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
This commit is contained in:
David Hildenbrand 2019-02-27 09:12:09 +01:00
parent c7f22b31ce
commit 08ef92d556
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/s390-virtio-ccw.c
View File

@ -669,7 +669,9 @@ DEFINE_CCW_MACHINE(4_1, "4.1", true);
static void ccw_machine_4_0_instance_options(MachineState *machine) static void ccw_machine_4_0_instance_options(MachineState *machine)
{ {
static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V4_0 };
ccw_machine_4_1_instance_options(machine); ccw_machine_4_1_instance_options(machine);
s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
} }
static void ccw_machine_4_0_class_options(MachineClass *mc) static void ccw_machine_4_0_class_options(MachineClass *mc)

4
target/s390x/cpu_models.c
View File

@ -86,8 +86,8 @@ static S390CPUDef s390_cpu_defs[] = {
CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"), CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
}; };
#define QEMU_MAX_CPU_TYPE 0x2827 #define QEMU_MAX_CPU_TYPE 0x2964
#define QEMU_MAX_CPU_GEN 12 #define QEMU_MAX_CPU_GEN 13
#define QEMU_MAX_CPU_EC_GA 2 #define QEMU_MAX_CPU_EC_GA 2
static const S390FeatInit qemu_max_cpu_feat_init = { S390_FEAT_LIST_QEMU_MAX }; static const S390FeatInit qemu_max_cpu_feat_init = { S390_FEAT_LIST_QEMU_MAX };
static S390FeatBitmap qemu_max_cpu_feat; static S390FeatBitmap qemu_max_cpu_feat;

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

@ -689,7 +689,7 @@ static uint16_t qemu_V3_1[] = {
S390_FEAT_MSA_EXT_4, S390_FEAT_MSA_EXT_4,
}; };
static uint16_t qemu_LATEST[] = { static uint16_t qemu_V4_0[] = {
/* /*
* Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER not * Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER not
* implemented yet). * implemented yet).
@ -698,11 +698,13 @@ static uint16_t qemu_LATEST[] = {
S390_FEAT_ZPCI, S390_FEAT_ZPCI,
}; };
/* add all new definitions before this point */ static uint16_t qemu_LATEST[] = {
static uint16_t qemu_MAX[] = {
/* z13+ features */
S390_FEAT_STFLE_53, S390_FEAT_STFLE_53,
S390_FEAT_VECTOR, S390_FEAT_VECTOR,
};
/* add all new definitions before this point */
static uint16_t qemu_MAX[] = {
/* generates a dependency warning, leave it out for now */ /* generates a dependency warning, leave it out for now */
S390_FEAT_MSA_EXT_5, S390_FEAT_MSA_EXT_5,
}; };
@ -821,6 +823,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
static FeatGroupDefSpec QemuFeatDef[] = { static FeatGroupDefSpec QemuFeatDef[] = {
QEMU_FEAT_INITIALIZER(V2_11), QEMU_FEAT_INITIALIZER(V2_11),
QEMU_FEAT_INITIALIZER(V3_1), QEMU_FEAT_INITIALIZER(V3_1),
QEMU_FEAT_INITIALIZER(V4_0),
QEMU_FEAT_INITIALIZER(LATEST), QEMU_FEAT_INITIALIZER(LATEST),
QEMU_FEAT_INITIALIZER(MAX), QEMU_FEAT_INITIALIZER(MAX),
}; };