aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Miller <dmiller423@gmail.com>2022-04-28 11:47:07 +0200
committerThomas Huth <thuth@redhat.com>2022-05-04 08:47:19 +0200
commit4f9b6c7ddb2937157a6f87de6bb79a5b93dcea5a (patch)
tree139b397157a1e8d14f0ca3a81e67a25f75cd9024
parentd621f7bd0a180dee785f2aabdc857829c1acf9e8 (diff)
downloadqemu-4f9b6c7ddb2937157a6f87de6bb79a5b93dcea5a.zip
qemu-4f9b6c7ddb2937157a6f87de6bb79a5b93dcea5a.tar.gz
qemu-4f9b6c7ddb2937157a6f87de6bb79a5b93dcea5a.tar.bz2
target/s390x: add S390_FEAT_VECTOR_ENH2 to qemu CPU model
[ dh: take care of compat machines ] Signed-off-by: David Miller <dmiller423@gmail.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20220428094708.84835-13-david@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--hw/s390x/s390-virtio-ccw.c3
-rw-r--r--target/s390x/gen-features.c7
2 files changed, 9 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 8fa488d..047cca0 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -803,7 +803,10 @@ DEFINE_CCW_MACHINE(7_1, "7.1", true);
static void ccw_machine_7_0_instance_options(MachineState *machine)
{
+ static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V7_0 };
+
ccw_machine_7_1_instance_options(machine);
+ s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat);
}
static void ccw_machine_7_0_class_options(MachineClass *mc)
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
index ec7d8ce..c03ec2c 100644
--- a/target/s390x/gen-features.c
+++ b/target/s390x/gen-features.c
@@ -738,13 +738,17 @@ static uint16_t qemu_V6_2[] = {
S390_FEAT_VECTOR_ENH,
};
+static uint16_t qemu_V7_0[] = {
+ S390_FEAT_MISC_INSTRUCTION_EXT3,
+};
+
/*
* Features for the "qemu" CPU model of the latest QEMU machine and the "max"
* CPU model under TCG. Don't include features that are not part of the full
* feature set of the current "max" CPU model generation.
*/
static uint16_t qemu_MAX[] = {
- S390_FEAT_MISC_INSTRUCTION_EXT3,
+ S390_FEAT_VECTOR_ENH2,
};
/****** END FEATURE DEFS ******/
@@ -866,6 +870,7 @@ static FeatGroupDefSpec QemuFeatDef[] = {
QEMU_FEAT_INITIALIZER(V4_1),
QEMU_FEAT_INITIALIZER(V6_0),
QEMU_FEAT_INITIALIZER(V6_2),
+ QEMU_FEAT_INITIALIZER(V7_0),
QEMU_FEAT_INITIALIZER(MAX),
};