[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-2.12 10/16] s390x/tcg: use s390_program_inter
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v3 for-2.12 10/16] s390x/tcg: use s390_program_interrupt() in SCLP Service Call |
Date: |
Thu, 30 Nov 2017 17:27:38 +0100 |
Now we can drop potential_page_fault(). While at it, move the
unlock further up, looks cleaner.
Signed-off-by: David Hildenbrand <address@hidden>
---
target/s390x/misc_helper.c | 5 ++---
target/s390x/translate.c | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 556340756c..02654617b3 100644
--- 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 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
- [Qemu-devel] [PATCH v3 for-2.12 00/16] s390x/tcg: cleanup and fix program interrupts, David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 01/16] s390x/tcg: introduce and use s390_program_interrupt(), David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 02/16] s390x/tcg: get rid of runtime_exception(), David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 03/16] s390x/tcg: rip out dead tpi code, David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 04/16] s390x/ioinst: pass the retaddr to all IO instructions, David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 05/16] s390x/pci: pass the retaddr to all PCI instructions, David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 07/16] s390x: handle exceptions during s390_cpu_virt_mem_rw() correctly (TCG), David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 06/16] s390x/diag: pass the retaddr into handle_diag_308(), David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 08/16] s390x/tcg: don't exit the cpu loop in s390_cpu_virt_mem_rw(), David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 09/16] s390x/tcg: io instructions don't need potential_page_fault(), David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 10/16] s390x/tcg: use s390_program_interrupt() in SCLP Service Call,
David Hildenbrand <=
- [Qemu-devel] [PATCH v3 for-2.12 12/16] s390x/tcg: use s390_program_interrupt() in per_check_exception(), David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 11/16] s390x/tcg: use s390_program_interrupt() in DIAG, David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 13/16] s390x/tcg: use s390_program_interrupt() in SACF, David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 14/16] s390x/tcg: use s390_program_interrupt() in STSI, David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 15/16] s390x/tcg: drop program_interrupt(), David Hildenbrand, 2017/11/30
- [Qemu-devel] [PATCH v3 for-2.12 16/16] s390x/tcg: drop potential_page_fault(), David Hildenbrand, 2017/11/30
- Re: [Qemu-devel] [PATCH v3 for-2.12 00/16] s390x/tcg: cleanup and fix program interrupts, Cornelia Huck, 2017/11/30