From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJmZo-00011n-TA for qemu-devel@nongnu.org; Tue, 28 Nov 2017 15:33:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJmZo-0003mv-57 for qemu-devel@nongnu.org; Tue, 28 Nov 2017 15:33:56 -0500 From: David Hildenbrand Date: Tue, 28 Nov 2017 21:33:19 +0100 Message-Id: <20171128203326.6062-10-david@redhat.com> In-Reply-To: <20171128203326.6062-1-david@redhat.com> References: <20171128203326.6062-1-david@redhat.com> Subject: [Qemu-devel] [PATCH v1 for-2.12 09/15] s390x/tcg: use program_interrupt_ra() in SCLP Service Call List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-s390x@nongnu.org, qemu-devel@nongnu.org Cc: Christian Borntraeger , Cornelia Huck , Richard Henderson , Alexander Graf , David Hildenbrand Now we can drop potential_page_fault(). Signed-off-by: David Hildenbrand --- target/s390x/misc_helper.c | 3 +-- target/s390x/translate.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index e50ea480be..3c2b589f7b 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -63,8 +63,7 @@ uint32_t HELPER(servc)(CPUS390XState *env, uint64_t r1, uint64_t r2) qemu_mutex_lock_iothread(); int r = sclp_service_call(env, r1, r2); if (r < 0) { - program_interrupt(env, -r, 4); - r = 0; + program_interrupt_ra(env, -r, 4, GETPC()); } qemu_mutex_unlock_iothread(); return r; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index d0859c4bc7..76b222b0ce 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3704,7 +3704,6 @@ static ExitStatus op_sqxb(DisasContext *s, DisasOps *o) static ExitStatus op_servc(DisasContext *s, DisasOps *o) { check_privileged(s); - potential_page_fault(s); gen_helper_servc(cc_op, cpu_env, o->in2, o->in1); set_cc_static(s); return NO_EXIT; -- 2.14.3