mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x/cpumodel: Add more feature to gen16 default model

Browse Source 
Add the new gen16 features to the default model and fence them for
machine version 6.1 and earlier.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210907101017.27126-1-borntraeger@de.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Christian Borntraeger 2021-09-07 10:10:17 +00:00 committed by Thomas Huth
parent ed3288ff8f
commit 30e398f796
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -803,6 +803,11 @@ DEFINE_CCW_MACHINE(6_2, "6.2", true);
static void ccw_machine_6_1_instance_options(MachineState *machine) static void ccw_machine_6_1_instance_options(MachineState *machine)
{ {
ccw_machine_6_2_instance_options(machine); ccw_machine_6_2_instance_options(machine);
s390_cpudef_featoff_greater(16, 1, S390_FEAT_NNPA);
s390_cpudef_featoff_greater(16, 1, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2);
s390_cpudef_featoff_greater(16, 1, S390_FEAT_BEAR_ENH);
s390_cpudef_featoff_greater(16, 1, S390_FEAT_RDP);
s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAI);
} }
static void ccw_machine_6_1_class_options(MachineClass *mc) static void ccw_machine_6_1_class_options(MachineClass *mc)

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

@ -663,7 +663,13 @@ static uint16_t default_GEN15_GA1[] = {
S390_FEAT_ETOKEN, S390_FEAT_ETOKEN,
}; };
#define default_GEN16_GA1 EmptyFeat static uint16_t default_GEN16_GA1[] = {
S390_FEAT_NNPA,
S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2,
S390_FEAT_BEAR_ENH,
S390_FEAT_RDP,
S390_FEAT_PAI,
};
/* QEMU (CPU model) features */ /* QEMU (CPU model) features */