s390x/tcg: use s390_program_interrupt() in SCLP Service Call

Now we can drop potential_page_fault(). While at it, move the
unlock further up, looks cleaner.

Signed-off-by: David Hildenbrand <[email protected]>
Message-Id: <20171130162744[email protected]>
Signed-off-by: Cornelia Huck <[email protected]>

diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 556340756c2bded88dc8e634c526142db8455f0e..02654617b30e0b4a1b4f42e319c5b6f381a2727d 100644 (file)
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -62,11 +62,10 @@ uint32_t HELPER(servc)(CPUS390XState *env, uint64_t r1, uint64_t r2)
 {
     qemu_mutex_lock_iothread();
     int r = sclp_service_call(env, r1, r2);
+    qemu_mutex_unlock_iothread();
     if (r < 0) {
-        program_interrupt(env, -r, 4);
-        r = 0;
+        s390_program_interrupt(env, -r, 4, GETPC());
     }
-    qemu_mutex_unlock_iothread();
     return r;
 }
 

diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index d0859c4bc76f43fca638b6e23e88532bea2d04d2..76b222b0ce775a4fb69acc1b476ecc5db60300a4 100644 (file)
--- 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;