From: Thomas Huth <thuth@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, David Miller <dmiller423@gmail.com>,
David Hildenbrand <david@redhat.com>
Subject: [PULL 12/15] target/s390x: add S390_FEAT_VECTOR_ENH2 to qemu CPU model
Date: Wed, 4 May 2022 13:05:18 +0200 [thread overview]
Message-ID: <20220504110521.343519-13-thuth@redhat.com> (raw)
In-Reply-To: <20220504110521.343519-1-thuth@redhat.com>
From: David Miller <dmiller423@gmail.com>
[ 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>
---
hw/s390x/s390-virtio-ccw.c | 3 +++
target/s390x/gen-features.c | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 8fa488d13a..047cca0487 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 ec7d8ceab5..c03ec2c9a9 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),
};
--
2.27.0
next prev parent reply other threads:[~2022-05-04 11:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 11:05 [PULL 00/15] s390x patches Thomas Huth
2022-05-04 11:05 ` [PULL 01/15] target/s390x: Fix writeback to v1 in helper_vstl Thomas Huth
2022-05-04 11:05 ` [PULL 02/15] s390x/cpu_models: drop "msa5" from the TCG "max" model Thomas Huth
2022-05-04 11:05 ` [PULL 03/15] s390x/cpu_models: make "max" match the unmodified "qemu" CPU model under TCG Thomas Huth
2022-05-04 11:05 ` [PULL 04/15] tcg: Implement tcg_gen_{h,w}swap_{i32,i64} Thomas Huth
2022-05-04 11:05 ` [PULL 05/15] target/s390x: vxeh2: vector convert short/32b Thomas Huth
2022-05-04 11:05 ` [PULL 06/15] target/s390x: vxeh2: vector string search Thomas Huth
2022-05-13 15:54 ` Peter Maydell
2022-05-13 16:16 ` Richard Henderson
2022-05-13 16:21 ` Peter Maydell
2022-05-04 11:05 ` [PULL 07/15] target/s390x: vxeh2: Update for changes to vector shifts Thomas Huth
2022-05-04 11:05 ` [PULL 08/15] target/s390x: vxeh2: vector shift double by bit Thomas Huth
2022-05-04 11:05 ` [PULL 09/15] target/s390x: vxeh2: vector {load, store} elements reversed Thomas Huth
2022-05-04 11:05 ` [PULL 10/15] target/s390x: vxeh2: vector {load, store} byte reversed elements Thomas Huth
2022-05-04 11:05 ` [PULL 11/15] target/s390x: vxeh2: vector {load, store} byte reversed element Thomas Huth
2022-05-04 11:05 ` Thomas Huth [this message]
2022-05-04 11:05 ` [PULL 13/15] tests/tcg/s390x: Tests for Vector Enhancements Facility 2 Thomas Huth
2022-05-04 11:05 ` [PULL 14/15] disas: Remove old libopcode s390 disassembler Thomas Huth
2022-05-04 11:05 ` [PULL 15/15] tests/tcg/s390x: Use a different PCRel32 notation in branch-relative-long.c Thomas Huth
2022-05-04 20:43 ` [PULL 00/15] s390x patches Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220504110521.343519-13-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=david@redhat.com \
--cc=dmiller423@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).