84 lines
2.8 KiB
Diff
84 lines
2.8 KiB
Diff
|
From 999cf62d870ff9aa8e9609fcbbcefef9ae1aceb6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 May 2020 05:53:50 -0400
|
||
|
|
Subject: [PATCH 08/42] s390x: kvm: Make kvm_sclp_service_call void
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <20200529055420.16855-9-thuth@redhat.com>
|
||
|
|
Patchwork-id: 97030
|
||
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 08/38] s390x: kvm: Make kvm_sclp_service_call void
|
||
|
|
Bugzilla: 1828317
|
||
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
|
||
|
|
From: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
|
||
|
|
It defaults to returning 0 anyway and that return value is not
|
||
|
|
necessary, as 0 is also the default rc that the caller would return.
|
||
|
|
|
||
|
|
While doing that we can simplify the logic a bit and return early if
|
||
|
|
we inject a PGM exception.
|
||
|
|
|
||
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-Id: <20191129091713.4582-1-frankja@linux.ibm.com>
|
||
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
||
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
(cherry picked from commit 15b6c0370c3e2774fd9ffda5c10c6e36952e8eb6)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
target/s390x/kvm.c | 12 +++++-------
|
||
|
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
|
||
|
|
index a02d569537..1c5bc7a2f9 100644
|
||
|
|
--- a/target/s390x/kvm.c
|
||
|
|
+++ b/target/s390x/kvm.c
|
||
|
|
@@ -1159,13 +1159,13 @@ void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_code)
|
||
|
|
kvm_s390_vcpu_interrupt(cpu, &irq);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run,
|
||
|
|
+static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run,
|
||
|
|
uint16_t ipbh0)
|
||
|
|
{
|
||
|
|
CPUS390XState *env = &cpu->env;
|
||
|
|
uint64_t sccb;
|
||
|
|
uint32_t code;
|
||
|
|
- int r = 0;
|
||
|
|
+ int r;
|
||
|
|
|
||
|
|
sccb = env->regs[ipbh0 & 0xf];
|
||
|
|
code = env->regs[(ipbh0 & 0xf0) >> 4];
|
||
|
|
@@ -1173,11 +1173,9 @@ static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run,
|
||
|
|
r = sclp_service_call(env, sccb, code);
|
||
|
|
if (r < 0) {
|
||
|
|
kvm_s390_program_interrupt(cpu, -r);
|
||
|
|
- } else {
|
||
|
|
- setcc(cpu, r);
|
||
|
|
+ return;
|
||
|
|
}
|
||
|
|
-
|
||
|
|
- return 0;
|
||
|
|
+ setcc(cpu, r);
|
||
|
|
}
|
||
|
|
|
||
|
|
static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
|
||
|
|
@@ -1240,7 +1238,7 @@ static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
|
||
|
|
setcc(cpu, 3);
|
||
|
|
break;
|
||
|
|
case PRIV_B2_SCLP_CALL:
|
||
|
|
- rc = kvm_sclp_service_call(cpu, run, ipbh0);
|
||
|
|
+ kvm_sclp_service_call(cpu, run, ipbh0);
|
||
|
|
break;
|
||
|
|
default:
|
||
|
|
rc = -1;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|