diff options
| author | David Hildenbrand <david@redhat.com> | 2017-12-08 17:02:02 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-12-14 17:56:54 +0100 |
| commit | a9de75a0b8b5acb26f26bd0048f0a33b416e5f66 (patch) | |
| tree | dedbd1f188d1812403e41c5caab10163fadf274e /target | |
| parent | 86c34633c5a822e5eebed96ae163426e2615abc1 (diff) | |
| download | qemu-a9de75a0b8b5acb26f26bd0048f0a33b416e5f66.zip qemu-a9de75a0b8b5acb26f26bd0048f0a33b416e5f66.tar.gz qemu-a9de75a0b8b5acb26f26bd0048f0a33b416e5f66.tar.bz2 | |
s390x/tcg: wire up SET CHANNEL MONITOR
Let's just wire it up like KVM.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20171208160207.26494-10-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/s390x/helper.h | 1 | ||||
| -rw-r--r-- | target/s390x/insn-data.def | 1 | ||||
| -rw-r--r-- | target/s390x/misc_helper.c | 9 | ||||
| -rw-r--r-- | target/s390x/translate.c | 7 |
4 files changed, 18 insertions, 0 deletions
diff --git a/target/s390x/helper.h b/target/s390x/helper.h index f1acc34..102fbdd 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -166,6 +166,7 @@ DEF_HELPER_3(msch, void, env, i64, i64) DEF_HELPER_2(rchp, void, env, i64) DEF_HELPER_2(rsch, void, env, i64) DEF_HELPER_2(sal, void, env, i64) +DEF_HELPER_4(schm, void, env, i64, i64, i64) DEF_HELPER_3(ssch, void, env, i64, i64) DEF_HELPER_2(stcrw, void, env, i64) DEF_HELPER_3(stsch, void, env, i64, i64) diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def index 11746f5..0c225d5 100644 --- a/target/s390x/insn-data.def +++ b/target/s390x/insn-data.def @@ -1055,6 +1055,7 @@ C(0xb23b, RCHP, S, Z, 0, 0, 0, 0, rchp, 0) C(0xb238, RSCH, S, Z, 0, 0, 0, 0, rsch, 0) C(0xb237, SAL, S, Z, 0, 0, 0, 0, sal, 0) + C(0xb23c, SCHM, S, Z, 0, insn, 0, 0, schm, 0) C(0xb233, SSCH, S, Z, 0, insn, 0, 0, ssch, 0) C(0xb239, STCRW, S, Z, 0, insn, 0, 0, stcrw, 0) C(0xb234, STSCH, S, Z, 0, insn, 0, 0, stsch, 0) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 1941c9c..7ddade2 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -386,6 +386,15 @@ void HELPER(sal)(CPUS390XState *env, uint64_t r1) qemu_mutex_unlock_iothread(); } +void HELPER(schm)(CPUS390XState *env, uint64_t r1, uint64_t r2, uint64_t inst) +{ + S390CPU *cpu = s390_env_get_cpu(env); + + qemu_mutex_lock_iothread(); + ioinst_handle_schm(cpu, r1, r2, inst >> 16, GETPC()); + qemu_mutex_unlock_iothread(); +} + void HELPER(ssch)(CPUS390XState *env, uint64_t r1, uint64_t inst) { S390CPU *cpu = s390_env_get_cpu(env); diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 30d3d76..8cf35a7 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4125,6 +4125,13 @@ static ExitStatus op_sal(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_schm(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_schm(cpu_env, regs[1], regs[2], o->in2); + return NO_EXIT; +} + static ExitStatus op_ssch(DisasContext *s, DisasOps *o) { check_privileged(s); |