Skip to contentSkip to conversation

s390x: Cleanup

PATCH Applied Janosch Frank 4 participants 29 messages Nov 27, 2019 – Nov 29, 2019

lore
Share & tools
lore
#0 lore raw

v4 cover s390x: Cleanup

Adding comments and reordering code for better readability in the diag308 and machine reset functions. Also making the kvm sclp function void and refactoring it.

v4
* Added sclp cleanup
* Renamed ccpu reset wrapper
* Added assert to cpu reset function

Janosch Frank (6):
s390x: Don't do a normal reset on the initial cpu
s390x: Move reset normal to shared reset handler
s390x: Move initial reset
s390x: Move clear reset
s390x: Beautify diag308 handling
s390x: kvm: Make kvm_sclp_service_call void

 hw/s390x/s390-virtio-ccw.c |   3 ++
 target/s390x/cpu-qom.h     |   9 +++-
 target/s390x/cpu.c         | 107 ++++++++++++++-----------------------
 target/s390x/cpu.h         |   4 +-
 target/s390x/diag.c        |  54 +++++++++++--------
 target/s390x/kvm.c         |  12 ++---
 target/s390x/sigp.c        |   4 +-
 7 files changed, 91 insertions(+), 102 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v4 1/6 s390x: Don't do a normal reset on the initial cpu

The initiating cpu needs to be reset with an initial reset. While doing a normal reset followed by a initial reset is not wrong per se, the Ultravisor will only allow the correct reset to be performed.

---
 hw/s390x/s390-virtio-ccw.c | 3 +++
 1 file changed, 3 insertions(+)
hw/s390x/s390-virtio-ccw.c +3 -0
index d3edeef0ad..c1d1440272 100644
@@ -348,6 +348,9 @@ static void s390_machine_reset(MachineState *machine)
         break;
     case S390_RESET_LOAD_NORMAL:
         CPU_FOREACH(t) {
+            if (t == cs) {
+                continue;
+            }
             run_on_cpu(t, s390_do_cpu_reset, RUN_ON_CPU_NULL);
         }
         subsystem_reset();
Signature · 1 line
2.20.1
#2 lore raw

PATCH v4 2/6 s390x: Move reset normal to shared reset handler

In reply to Janosch Frank

Let's start moving the cpu reset functions into a single function with a switch/case, so we can use fallthroughs and share more code between resets.

This patch introduces the reset function by renaming cpu_reset() and cleaning up leftovers.

---
 target/s390x/cpu-qom.h |  6 +++++-
 target/s390x/cpu.c     | 19 +++++++++++++------
 target/s390x/cpu.h     |  2 +-
 target/s390x/sigp.c    |  2 +-
 4 files changed, 20 insertions(+), 9 deletions(-)
target/s390x/cpu-qom.h +5 -1
index b809ec8418..f3b71bac67 100644
@@ -34,6 +34,10 @@
 typedef struct S390CPUModel S390CPUModel;
 typedef struct S390CPUDef S390CPUDef;
 
+typedef enum cpu_reset_type {
+    S390_CPU_RESET_NORMAL,
+} cpu_reset_type;
+
 /**
  * S390CPUClass:
  * @parent_realize: The parent class' realize handler.
@@ -57,7 +61,7 @@ typedef struct S390CPUClass {
     DeviceRealize parent_realize;
     void (*parent_reset)(CPUState *cpu);
     void (*load_normal)(CPUState *cpu);
-    void (*cpu_reset)(CPUState *cpu);
+    void (*reset)(CPUState *cpu, cpu_reset_type type);
     void (*initial_cpu_reset)(CPUState *cpu);
 } S390CPUClass;
 
target/s390x/cpu.c +13 -6
index 3abe7e80fd..67d6fbfa44 100644
@@ -82,18 +82,25 @@ static void s390_cpu_load_normal(CPUState *s)
 }
 #endif
 
-/* S390CPUClass::cpu_reset() */
-static void s390_cpu_reset(CPUState *s)
+/* S390CPUClass::reset() */
+static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
 {
     S390CPU *cpu = S390_CPU(s);
     S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
     CPUS390XState *env = &cpu->env;
 
-    env->pfault_token = -1UL;
-    env->bpbc = false;
     scc->parent_reset(s);
     cpu->env.sigp_order = 0;
     s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
+
+    switch (type) {
+    case S390_CPU_RESET_NORMAL:
+        env->pfault_token = -1UL;
+        env->bpbc = false;
+        break;
+    default:
+        g_assert_not_reached();
+    }
 }
 
 /* S390CPUClass::initial_reset() */
@@ -102,7 +109,7 @@ static void s390_cpu_initial_reset(CPUState *s)
     S390CPU *cpu = S390_CPU(s);
     CPUS390XState *env = &cpu->env;
 
-    s390_cpu_reset(s);
+    s390_cpu_reset(s, S390_CPU_RESET_NORMAL);
     /* initial reset does not clear everything! */
     memset(&env->start_initial_reset_fields, 0,
         offsetof(CPUS390XState, end_reset_fields) -
@@ -473,7 +480,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
 #if !defined(CONFIG_USER_ONLY)
     scc->load_normal = s390_cpu_load_normal;
 #endif
-    scc->cpu_reset = s390_cpu_reset;
+    scc->reset = s390_cpu_reset;
     scc->initial_cpu_reset = s390_cpu_initial_reset;
     cc->reset = s390_cpu_full_reset;
     cc->class_by_name = s390_cpu_class_by_name,
target/s390x/cpu.h +1 -1
index 17460ed7b3..18123dfd5b 100644
@@ -741,7 +741,7 @@ static inline void s390_do_cpu_reset(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPUClass *scc = S390_CPU_GET_CLASS(cs);
 
-    scc->cpu_reset(cs);
+    scc->reset(cs, S390_CPU_RESET_NORMAL);
 }
 
 static inline void s390_do_cpu_initial_reset(CPUState *cs, run_on_cpu_data arg)
target/s390x/sigp.c +1 -1
index 2ce22d4dc1..850139b9cd 100644
@@ -266,7 +266,7 @@ static void sigp_cpu_reset(CPUState *cs, run_on_cpu_data arg)
     SigpInfo *si = arg.host_ptr;
 
     cpu_synchronize_state(cs);
-    scc->cpu_reset(cs);
+    scc->reset(cs, S390_CPU_RESET_NORMAL);
     cpu_synchronize_post_reset(cs);
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
Signature · 1 line
2.20.1
Reviewed-by on v4 2/6
#3 lore raw

Re: [PATCH v4 2/6] s390x: Move reset normal to shared reset handler

Quoted 3 lines · Janosch Frank

Let's start moving the cpu reset functions into a single function with a switch/case, so we can use fallthroughs and share more code between resets.

Nit: I'd add a "later" in above sentence, since you don't use fallthroughs yet.

Quoted 2 lines

This patch introduces the reset function by renaming cpu_reset() and cleaning up leftovers.

Hmm, which leftovers? I can mainly see the renaming here...

Quoted 8 lines
---
  target/s390x/cpu-qom.h |  6 +++++-
  target/s390x/cpu.c     | 19 +++++++++++++------
  target/s390x/cpu.h     |  2 +-
  target/s390x/sigp.c    |  2 +-
  4 files changed, 20 insertions(+), 9 deletions(-)

Anyway,

#4 lore raw

Re: [PATCH v4 2/6] s390x: Move reset normal to shared reset handler

Quoted 7 lines · On Thu, 28 Nov 2019 07:32:53 +0100 Thomas Huth <[email protected]> wrote:
Quoted 3 lines · Janosch Frank

Let's start moving the cpu reset functions into a single function with a switch/case, so we can use fallthroughs and share more code between resets.

Nit: I'd add a "later" in above sentence, since you don't use fallthroughs yet.

If nobody objects, I can apply this with the sentence changed to "so we can later use...".

Quoted 5 lines
Quoted 3 lines

This patch introduces the reset function by renaming cpu_reset() and cleaning up leftovers.

Hmm, which leftovers? I can mainly see the renaming here...

That's probably a leftover from before splitting the original patch in three... I can drop the leftover part when applying :)

Quoted 12 lines
Quoted 9 lines
---
  target/s390x/cpu-qom.h |  6 +++++-
  target/s390x/cpu.c     | 19 +++++++++++++------
  target/s390x/cpu.h     |  2 +-
  target/s390x/sigp.c    |  2 +-
  4 files changed, 20 insertions(+), 9 deletions(-)  

Anyway,

#5 lore raw

PATCH v4 3/6 s390x: Move initial reset

In reply to Janosch Frank

Let's move the intial reset into the reset handler and cleanup afterwards.

---
 target/s390x/cpu-qom.h |  2 +-
 target/s390x/cpu.c     | 44 ++++++++++++++++--------------------------
 target/s390x/cpu.h     |  2 +-
 target/s390x/sigp.c    |  2 +-
 4 files changed, 20 insertions(+), 30 deletions(-)
target/s390x/cpu-qom.h +1 -1
index f3b71bac67..6f0a12042e 100644
@@ -36,6 +36,7 @@ typedef struct S390CPUDef S390CPUDef;
 
 typedef enum cpu_reset_type {
     S390_CPU_RESET_NORMAL,
+    S390_CPU_RESET_INITIAL,
 } cpu_reset_type;
 
 /**
@@ -62,7 +63,6 @@ typedef struct S390CPUClass {
     void (*parent_reset)(CPUState *cpu);
     void (*load_normal)(CPUState *cpu);
     void (*reset)(CPUState *cpu, cpu_reset_type type);
-    void (*initial_cpu_reset)(CPUState *cpu);
 } S390CPUClass;
 
 typedef struct S390CPU S390CPU;
target/s390x/cpu.c +17 -27

62 lines not on this page · raw message

target/s390x/cpu.h +1 -1
index 18123dfd5b..d2af13b345 100644
@@ -748,7 +748,7 @@ static inline void s390_do_cpu_initial_reset(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPUClass *scc = S390_CPU_GET_CLASS(cs);
 
-    scc->initial_cpu_reset(cs);
+    scc->reset(cs, S390_CPU_RESET_INITIAL);
 }
 
 static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)
target/s390x/sigp.c +1 -1
index 850139b9cd..727875bb4a 100644
@@ -254,7 +254,7 @@ static void sigp_initial_cpu_reset(CPUState *cs, run_on_cpu_data arg)
     SigpInfo *si = arg.host_ptr;
 
     cpu_synchronize_state(cs);
-    scc->initial_cpu_reset(cs);
+    scc->reset(cs, S390_CPU_RESET_INITIAL);
     cpu_synchronize_post_reset(cs);
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
Signature · 1 line
2.20.1
#6 lore raw

Re: [PATCH v4 3/6] s390x: Move initial reset

Quoted 83 lines · Janosch Frank

Let's move the intial reset into the reset handler and cleanup afterwards.

---
  target/s390x/cpu-qom.h |  2 +-
  target/s390x/cpu.c     | 44 ++++++++++++++++--------------------------
  target/s390x/cpu.h     |  2 +-
  target/s390x/sigp.c    |  2 +-
  4 files changed, 20 insertions(+), 30 deletions(-)
target/s390x/cpu-qom.h +1 -1
index f3b71bac67..6f0a12042e 100644
@@ -36,6 +36,7 @@ typedef struct S390CPUDef S390CPUDef;
 
  typedef enum cpu_reset_type {
      S390_CPU_RESET_NORMAL,
+    S390_CPU_RESET_INITIAL,
  } cpu_reset_type;
 
  /**
@@ -62,7 +63,6 @@ typedef struct S390CPUClass {
      void (*parent_reset)(CPUState *cpu);
      void (*load_normal)(CPUState *cpu);
      void (*reset)(CPUState *cpu, cpu_reset_type type);
-    void (*initial_cpu_reset)(CPUState *cpu);
  } S390CPUClass;
 
  typedef struct S390CPU S390CPU;
target/s390x/cpu.c +17 -19
index 67d6fbfa44..55e2d1fe7b 100644
@@ -94,6 +94,23 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
      s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
 
      switch (type) {
+    case S390_CPU_RESET_INITIAL:
+        /* initial reset does not clear everything! */
+        memset(&env->start_initial_reset_fields, 0,
+               offsetof(CPUS390XState, end_reset_fields) -
+               offsetof(CPUS390XState, start_initial_reset_fields));
+
+        /* architectured initial value for Breaking-Event-Address register */
+        env->gbea = 1;
+
+        /* architectured initial values for CR 0 and 14 */
+        env->cregs[0] = CR0_RESET;
+        env->cregs[14] = CR14_RESET;
+
+        /* tininess for underflow is detected before rounding */
+        set_float_detect_tininess(float_tininess_before_rounding,
+                                  &env->fpu_status);
+       /* fall through */
      case S390_CPU_RESET_NORMAL:
          env->pfault_token = -1UL;
          env->bpbc = false;
@@ -101,32 +118,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
      default:
          g_assert_not_reached();
      }
-}
-
-/* S390CPUClass::initial_reset() */
-static void s390_cpu_initial_reset(CPUState *s)
-{
-    S390CPU *cpu = S390_CPU(s);
-    CPUS390XState *env = &cpu->env;
-
-    s390_cpu_reset(s, S390_CPU_RESET_NORMAL);
-    /* initial reset does not clear everything! */
-    memset(&env->start_initial_reset_fields, 0,
-        offsetof(CPUS390XState, end_reset_fields) -
-        offsetof(CPUS390XState, start_initial_reset_fields));
-
-    /* architectured initial values for CR 0 and 14 */
-    env->cregs[0] = CR0_RESET;
-    env->cregs[14] = CR14_RESET;
-
-    /* architectured initial value for Breaking-Event-Address register */

target/s390x/cpu.c static void s390_cpu_reset(CPUState *s, cpu_reset_type type) · line 123

Quoted 10 lines
target/s390x/cpu.c +0 -7
-    env->gbea = 1;
-
-    env->pfault_token = -1UL;
-
-    /* tininess for underflow is detected before rounding */
-    set_float_detect_tininess(float_tininess_before_rounding,
-                              &env->fpu_status);
 
      /* Reset state inside the kernel that we cannot access yet from QEMU. */
      if (kvm_enabled()) {

You're doing the if (kvm_enabled()) now also for S390_CPU_RESET_NORMAL ... is that OK? It's doing an KVM_S390_INITIAL_RESET ioctl(), so that sounds suspicious to me. Don't you have to add a check for type != S390_CPU_RESET_NORMAL here?

Thomas

#7 lore raw

Re: [PATCH v4 3/6] s390x: Move initial reset

Quoted 100 lines · Thomas Huth
Quoted 83 lines · Janosch Frank

Let's move the intial reset into the reset handler and cleanup afterwards.

---
  target/s390x/cpu-qom.h |  2 +-
  target/s390x/cpu.c     | 44 ++++++++++++++++--------------------------
  target/s390x/cpu.h     |  2 +-
  target/s390x/sigp.c    |  2 +-
  4 files changed, 20 insertions(+), 30 deletions(-)
target/s390x/cpu-qom.h +1 -1
index f3b71bac67..6f0a12042e 100644
@@ -36,6 +36,7 @@ typedef struct S390CPUDef S390CPUDef;
 
  typedef enum cpu_reset_type {
      S390_CPU_RESET_NORMAL,
+    S390_CPU_RESET_INITIAL,
  } cpu_reset_type;
 
  /**
@@ -62,7 +63,6 @@ typedef struct S390CPUClass {
      void (*parent_reset)(CPUState *cpu);
      void (*load_normal)(CPUState *cpu);
      void (*reset)(CPUState *cpu, cpu_reset_type type);
-    void (*initial_cpu_reset)(CPUState *cpu);
  } S390CPUClass;
 
  typedef struct S390CPU S390CPU;
target/s390x/cpu.c +17 -19
index 67d6fbfa44..55e2d1fe7b 100644
@@ -94,6 +94,23 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
      s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
 
      switch (type) {
+    case S390_CPU_RESET_INITIAL:
+        /* initial reset does not clear everything! */
+        memset(&env->start_initial_reset_fields, 0,
+               offsetof(CPUS390XState, end_reset_fields) -
+               offsetof(CPUS390XState, start_initial_reset_fields));
+
+        /* architectured initial value for Breaking-Event-Address register */
+        env->gbea = 1;
+
+        /* architectured initial values for CR 0 and 14 */
+        env->cregs[0] = CR0_RESET;
+        env->cregs[14] = CR14_RESET;
+
+        /* tininess for underflow is detected before rounding */
+        set_float_detect_tininess(float_tininess_before_rounding,
+                                  &env->fpu_status);
+       /* fall through */
      case S390_CPU_RESET_NORMAL:
          env->pfault_token = -1UL;
          env->bpbc = false;
@@ -101,32 +118,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
      default:
          g_assert_not_reached();
      }
-}
-
-/* S390CPUClass::initial_reset() */
-static void s390_cpu_initial_reset(CPUState *s)
-{
-    S390CPU *cpu = S390_CPU(s);
-    CPUS390XState *env = &cpu->env;
-
-    s390_cpu_reset(s, S390_CPU_RESET_NORMAL);
-    /* initial reset does not clear everything! */
-    memset(&env->start_initial_reset_fields, 0,
-        offsetof(CPUS390XState, end_reset_fields) -
-        offsetof(CPUS390XState, start_initial_reset_fields));
-
-    /* architectured initial values for CR 0 and 14 */
-    env->cregs[0] = CR0_RESET;
-    env->cregs[14] = CR14_RESET;
-
-    /* architectured initial value for Breaking-Event-Address register */

target/s390x/cpu.c static void s390_cpu_reset(CPUState *s, cpu_reset_type type) · line 123

Quoted 10 lines
target/s390x/cpu.c +0 -7
-    env->gbea = 1;
-
-    env->pfault_token = -1UL;
-
-    /* tininess for underflow is detected before rounding */
-    set_float_detect_tininess(float_tininess_before_rounding,
-                              &env->fpu_status);
 
      /* Reset state inside the kernel that we cannot access yet from QEMU. */
      if (kvm_enabled()) {

You're doing the if (kvm_enabled()) now also for S390_CPU_RESET_NORMAL ... is that OK? It's doing an KVM_S390_INITIAL_RESET ioctl(), so that sounds suspicious to me. Don't you have to add a check for type != S390_CPU_RESET_NORMAL here?

Quoted 1 line

Thomas

Yes, I need to fence the NORMAL case again.

Quoted 2 lines
#8 lore raw

PATCH v5 1/1 s390x: Move initial reset

In reply to Janosch Frank

Let's move the intial reset into the reset handler and cleanup afterwards.

---

Fixed the kvm vcpu reset.

---
 target/s390x/cpu-qom.h |  2 +-
 target/s390x/cpu.c     | 46 +++++++++++++++++-------------------------
 target/s390x/cpu.h     |  2 +-
 target/s390x/sigp.c    |  2 +-
 4 files changed, 21 insertions(+), 31 deletions(-)
target/s390x/cpu-qom.h +1 -1
index f3b71bac67..6f0a12042e 100644
@@ -36,6 +36,7 @@ typedef struct S390CPUDef S390CPUDef;
 
 typedef enum cpu_reset_type {
     S390_CPU_RESET_NORMAL,
+    S390_CPU_RESET_INITIAL,
 } cpu_reset_type;
 
 /**
@@ -62,7 +63,6 @@ typedef struct S390CPUClass {
     void (*parent_reset)(CPUState *cpu);
     void (*load_normal)(CPUState *cpu);
     void (*reset)(CPUState *cpu, cpu_reset_type type);
-    void (*initial_cpu_reset)(CPUState *cpu);
 } S390CPUClass;
 
 typedef struct S390CPU S390CPU;
target/s390x/cpu.c +18 -28

66 lines not on this page · raw message

target/s390x/cpu.h +1 -1
index 18123dfd5b..d2af13b345 100644
@@ -748,7 +748,7 @@ static inline void s390_do_cpu_initial_reset(CPUState *cs, run_on_cpu_data arg)
 {
     S390CPUClass *scc = S390_CPU_GET_CLASS(cs);
 
-    scc->initial_cpu_reset(cs);
+    scc->reset(cs, S390_CPU_RESET_INITIAL);
 }
 
 static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)
target/s390x/sigp.c +1 -1
index 850139b9cd..727875bb4a 100644
@@ -254,7 +254,7 @@ static void sigp_initial_cpu_reset(CPUState *cs, run_on_cpu_data arg)
     SigpInfo *si = arg.host_ptr;
 
     cpu_synchronize_state(cs);
-    scc->initial_cpu_reset(cs);
+    scc->reset(cs, S390_CPU_RESET_INITIAL);
     cpu_synchronize_post_reset(cs);
     si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;
 }
Signature · 1 line
2.20.1
Reviewed-by on v5 1/1
#9 lore raw

Re: [PATCH v5] s390x: Move initial reset

Quoted 7 lines · Janosch Frank

Let's move the intial reset into the reset handler and cleanup afterwards.

---

Quoted 8 lines

Fixed the kvm vcpu reset.

---
  target/s390x/cpu-qom.h |  2 +-
  target/s390x/cpu.c     | 46 +++++++++++++++++-------------------------
  target/s390x/cpu.h     |  2 +-
  target/s390x/sigp.c    |  2 +-
  4 files changed, 21 insertions(+), 31 deletions(-)
#10 lore raw

PATCH v4 4/6 s390x: Move clear reset

In reply to Janosch Frank

Let's also move the clear reset function into the reset handler.

---
 target/s390x/cpu-qom.h |  1 +
 target/s390x/cpu.c     | 58 +++++++++++++-----------------------------
 2 files changed, 18 insertions(+), 41 deletions(-)
target/s390x/cpu-qom.h +1 -0
index 6f0a12042e..dbe5346ec9 100644
@@ -37,6 +37,7 @@ typedef struct S390CPUDef S390CPUDef;
 typedef enum cpu_reset_type {
     S390_CPU_RESET_NORMAL,
     S390_CPU_RESET_INITIAL,
+    S390_CPU_RESET_CLEAR,
 } cpu_reset_type;
 
 /**
target/s390x/cpu.c +17 -41

88 lines not on this page · raw message

Signature · 1 line
2.20.1
Reviewed-by on v4 4/6
#13 lore raw

Re: [PATCH v4 4/6] s390x: Move clear reset

In reply to Janosch Frank
Quoted 7 lines · Janosch Frank

Let's also move the clear reset function into the reset handler.

---
  target/s390x/cpu-qom.h |  1 +
  target/s390x/cpu.c     | 58 +++++++++++++-----------------------------
  2 files changed, 18 insertions(+), 41 deletions(-)

I really wonder why we had so much duplicated code here before and nobody dared to clean it up in all those years... Thanks for doing that now!

#14 lore raw

Re: [PATCH v4 4/6] s390x: Move clear reset

Quoted 11 lines · Thomas Huth
Quoted 7 lines · Janosch Frank

Let's also move the clear reset function into the reset handler.

---
  target/s390x/cpu-qom.h |  1 +
  target/s390x/cpu.c     | 58 +++++++++++++-----------------------------
  2 files changed, 18 insertions(+), 41 deletions(-)

I really wonder why we had so much duplicated code here before and nobody dared to clean it up in all those years... Thanks for doing that now!

Looking back at my old patch series, I most often start with a cleanup before I change or add anything...

I'd guess that QEMU hasn't seen some love for a longer time.

Quoted 3 lines

Thanks!

#15 lore raw

Re: [PATCH v4 4/6] s390x: Move clear reset

Quoted 10 lines · Janosch Frank
Quoted 9 lines · Thomas Huth
Quoted 7 lines · Janosch Frank

Let's also move the clear reset function into the reset handler.

---
  target/s390x/cpu-qom.h |  1 +
  target/s390x/cpu.c     | 58 +++++++++++++-----------------------------
  2 files changed, 18 insertions(+), 41 deletions(-)
Quoted 7 lines
Quoted 2 lines

I really wonder why we had so much duplicated code here before and nobody dared to clean it up in all those years... Thanks for doing that now!

Looking back at my old patch series, I most often start with a cleanup before I change or add anything...

I'd guess that QEMU hasn't seen some love for a longer time.

Oh, I give QEMU some love quite often ... I just can't love every part of it equally well ;)

I'd like to second the "thanks" for doing this cleanup :)

Signature · 3 lines
Thanks,

David / dhildenb
#16 lore raw

PATCH v4 5/6 s390x: Beautify diag308 handling

In reply to Janosch Frank

Let's improve readability by:
* Using constants for the subcodes
* Moving parameter checking into a function
* Removing subcode > 6 check as the default case catches that

---
 target/s390x/diag.c | 54 +++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 22 deletions(-)
target/s390x/diag.c +32 -22
index 53c2f81f2a..b5aec06d6b 100644
@@ -53,6 +53,29 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
 #define DIAG_308_RC_NO_CONF         0x0102
 #define DIAG_308_RC_INVALID         0x0402
 
+#define DIAG308_RESET_MOD_CLR       0
+#define DIAG308_RESET_LOAD_NORM     1
+#define DIAG308_LOAD_CLEAR          3
+#define DIAG308_LOAD_NORMAL_DUMP    4
+#define DIAG308_SET                 5
+#define DIAG308_STORE               6
+
+static int diag308_parm_check(CPUS390XState *env, uint64_t r1, uint64_t addr,
+                              uintptr_t ra, bool write)
+{
+    if ((r1 & 1) || (addr & ~TARGET_PAGE_MASK)) {
+        s390_program_interrupt(env, PGM_SPECIFICATION, ra);
+        return -1;
+    }
+    if (!address_space_access_valid(&address_space_memory, addr,
+                                    sizeof(IplParameterBlock), write,
+                                    MEMTXATTRS_UNSPECIFIED)) {
+        s390_program_interrupt(env, PGM_ADDRESSING, ra);
+        return -1;
+    }
+    return 0;
+}
+
 void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
 {
     CPUState *cs = env_cpu(env);
@@ -65,30 +88,24 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
         return;
     }
 
-    if ((subcode & ~0x0ffffULL) || (subcode > 6)) {
+    if (subcode & ~0x0ffffULL) {
         s390_program_interrupt(env, PGM_SPECIFICATION, ra);
         return;
     }
 
     switch (subcode) {
-    case 0:
+    case DIAG308_RESET_MOD_CLR:
         s390_ipl_reset_request(cs, S390_RESET_MODIFIED_CLEAR);
         break;
-    case 1:
+    case DIAG308_RESET_LOAD_NORM:
         s390_ipl_reset_request(cs, S390_RESET_LOAD_NORMAL);
         break;
-    case 3:
+    case DIAG308_LOAD_CLEAR:
+        /* Well we still lack the clearing bit... */
         s390_ipl_reset_request(cs, S390_RESET_REIPL);
         break;
-    case 5:
-        if ((r1 & 1) || (addr & 0x0fffULL)) {
-            s390_program_interrupt(env, PGM_SPECIFICATION, ra);
-            return;
-        }
-        if (!address_space_access_valid(&address_space_memory, addr,
-                                        sizeof(IplParameterBlock), false,
-                                        MEMTXATTRS_UNSPECIFIED)) {
-            s390_program_interrupt(env, PGM_ADDRESSING, ra);
+    case DIAG308_SET:
+        if (diag308_parm_check(env, r1, addr, ra, false)) {
             return;
         }
         iplb = g_new0(IplParameterBlock, 1);
@@ -110,15 +127,8 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
 out:
         g_free(iplb);
         return;
-    case 6:
-        if ((r1 & 1) || (addr & 0x0fffULL)) {
-            s390_program_interrupt(env, PGM_SPECIFICATION, ra);
-            return;
-        }
-        if (!address_space_access_valid(&address_space_memory, addr,
-                                        sizeof(IplParameterBlock), true,
-                                        MEMTXATTRS_UNSPECIFIED)) {
-            s390_program_interrupt(env, PGM_ADDRESSING, ra);
+    case DIAG308_STORE:
+        if (diag308_parm_check(env, r1, addr, ra, true)) {
             return;
         }
         iplb = s390_ipl_get_iplb();
Signature · 1 line
2.20.1
#17 lore raw

PATCH v4 6/6 s390x: kvm: Make kvm_sclp_service_call void

In reply to Janosch Frank

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. Also we always set a 0 cc, so let's not base it on the rc of the sclp emulation functions.

---
 target/s390x/kvm.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
target/s390x/kvm.c +5 -7
index 0c9d14b4b1..08bb1edca0 100644
@@ -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, 0);
 }
 
 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;
Signature · 1 line
2.20.1
#18 lore raw

Re: [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void

Quoted 33 lines · Janosch Frank

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. Also we always set a 0 cc, so let's not base it on the rc of the sclp emulation functions.

---
 target/s390x/kvm.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
target/s390x/kvm.c +2 -2
index 0c9d14b4b1..08bb1edca0 100644
@@ -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];

target/s390x/kvm.c static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, · line 1178

Quoted 10 lines
target/s390x/kvm.c +2 -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, 0);

For now, sclp_service_call will return <= 0 ... but don't we actually have the option to return a cc? What does the spec say? Always set to 0?

At least also the TCG implementation sets the CC to whatever is returned here .... and Claudio's unit tests have code to handle cc != 0 ... and the kernel as well (drivers/s390/char/sclp.h:sclp_service_call())

Signature · 3 lines
Thanks,

David / dhildenb
#19 lore raw

Re: [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void

Quoted 48 lines · David Hildenbrand
Quoted 33 lines · Janosch Frank

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. Also we always set a 0 cc, so let's not base it on the rc of the sclp emulation functions.

---
 target/s390x/kvm.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
target/s390x/kvm.c +2 -2
index 0c9d14b4b1..08bb1edca0 100644
@@ -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];

target/s390x/kvm.c static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, · line 1178

Quoted 10 lines
target/s390x/kvm.c +2 -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, 0);

For now, sclp_service_call will return <= 0 ... but don't we actually have the option to return a cc? What does the spec say? Always set to 0?

Quoted 3 lines

At least also the TCG implementation sets the CC to whatever is returned here .... and Claudio's unit tests have code to handle cc != 0 ... and the kernel as well (drivers/s390/char/sclp.h:sclp_service_call())

There's 0 (initiated), busy and operational and as far as I know we implement neither.
sclp_service_call() returns either 0 or -PGM_CODE, so we don't need to check when we're after the pgm injection code.

#20 lore raw

Re: [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void

Quoted 3 lines · Janosch Frank

There's 0 (initiated), busy and operational and as far as I know we implement neither.

That came out wrong...
s/operational/not operational/

We only implement "command initiated" / cc = 0
We can never have busy, because we handle sclp calls synchronously. The spec does not give any indication when we could return "not operational". I guess that's just a free pass for hypervisors.

Quoted 2 lines

sclp_service_call() returns either 0 or -PGM_CODE, so we don't need to check when we're after the pgm injection code.

#21 lore raw

Re: [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void

Quoted 5 lines · On Wed, 27 Nov 2019 19:38:06 +0100 Janosch Frank <[email protected]> wrote:
Quoted 3 lines · Janosch Frank

There's 0 (initiated), busy and operational and as far as I know we implement neither.

Quoted 7 lines

That came out wrong...
s/operational/not operational/

We only implement "command initiated" / cc = 0
We can never have busy, because we handle sclp calls synchronously. The spec does not give any indication when we could return "not operational". I guess that's just a free pass for hypervisors.

Regardless, setcc(cpu, r) also feels a bit cleaner to me...

Quoted 5 lines
Quoted 3 lines

sclp_service_call() returns either 0 or -PGM_CODE, so we don't need to check when we're after the pgm injection code.

#22 lore raw

Re: [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void

Quoted 11 lines · Cornelia Huck
Quoted 8 lines · On Wed, 27 Nov 2019 19:38:06 +0100 Janosch Frank <[email protected]> wrote:
Quoted 3 lines · Janosch Frank

There's 0 (initiated), busy and operational and as far as I know we implement neither.

That came out wrong...
s/operational/not operational/

Quoted 6 lines
Quoted 4 lines

We only implement "command initiated" / cc = 0
We can never have busy, because we handle sclp calls synchronously. The spec does not give any indication when we could return "not operational". I guess that's just a free pass for hypervisors.

Regardless, setcc(cpu, r) also feels a bit cleaner to me...

Ok, do you want to change that while picking the patches up or shall I send a new version?

Quoted 7 lines
Quoted 6 lines
Quoted 4 lines

sclp_service_call() returns either 0 or -PGM_CODE, so we don't need to check when we're after the pgm injection code.

#23 lore raw

Re: [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void

Quoted 17 lines · On Fri, 29 Nov 2019 09:16:21 +0100 Janosch Frank <[email protected]> wrote:
Quoted 16 lines · Cornelia Huck
Quoted 12 lines · On Wed, 27 Nov 2019 19:38:06 +0100 Janosch Frank <[email protected]> wrote:
Quoted 3 lines · Janosch Frank

There's 0 (initiated), busy and operational and as far as I know we implement neither.

That came out wrong...
s/operational/not operational/

We only implement "command initiated" / cc = 0
We can never have busy, because we handle sclp calls synchronously. The spec does not give any indication when we could return "not operational". I guess that's just a free pass for hypervisors.

Quoted 4 lines
Quoted 1 line

Regardless, setcc(cpu, r) also feels a bit cleaner to me...

Ok, do you want to change that while picking the patches up or shall I send a new version?

New version (of this patch), please :) Easier for me...

#24 lore raw

PATCH v5 1/1 s390x: kvm: Make kvm_sclp_service_call void

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.

---
 target/s390x/kvm.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
target/s390x/kvm.c +5 -7
index 0c9d14b4b1..ad6e38c876 100644
@@ -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;
Signature · 1 line
2.20.1
Reviewed-by on v5 1/1
#25 lore raw

Re: [PATCH v5] s390x: kvm: Make kvm_sclp_service_call void

Quoted 48 lines · Janosch Frank

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.

---
 target/s390x/kvm.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
target/s390x/kvm.c +4 -6
index 0c9d14b4b1..ad6e38c876 100644
@@ -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)

target/s390x/kvm.c static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) · line 1244

Quoted 8 lines
target/s390x/kvm.c +1 -1
@@ -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;
Signature · 3 lines
Thanks,

David / dhildenb
#26 lore raw

Re: [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void

In reply to David Hildenbrand
Quoted 48 lines · David Hildenbrand
Quoted 33 lines · Janosch Frank

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. Also we always set a 0 cc, so let's not base it on the rc of the sclp emulation functions.

---
 target/s390x/kvm.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
target/s390x/kvm.c +2 -2
index 0c9d14b4b1..08bb1edca0 100644
@@ -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];

target/s390x/kvm.c static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, · line 1178

Quoted 10 lines
target/s390x/kvm.c +2 -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, 0);

For now, sclp_service_call will return <= 0 ... but don't we actually have the option to return a cc? What does the spec say? Always set to 0?

Quoted 4 lines

At least also the TCG implementation sets the CC to whatever is returned here .... and Claudio's unit tests have code to handle cc != 0 ... and the kernel as well (drivers/s390/char/sclp.h:sclp_service_call())

FWIW, I'd keep this as

setcc(cpu, r);

if we ever have to set a cc != 0.

Signature · 3 lines
Thanks,

David / dhildenb
Reviewed-by on v4 6/6
#27 lore raw

Re: [PATCH v4 6/6] s390x: kvm: Make kvm_sclp_service_call void

In reply to Janosch Frank
Quoted 33 lines · Janosch Frank

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. Also we always set a 0 cc, so let's not base it on the rc of the sclp emulation functions.

---
  target/s390x/kvm.c | 12 +++++-------
  1 file changed, 5 insertions(+), 7 deletions(-)
target/s390x/kvm.c +2 -2
index 0c9d14b4b1..08bb1edca0 100644
@@ -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];

target/s390x/kvm.c static int kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, · line 1178

Quoted 10 lines
target/s390x/kvm.c +2 -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, 0);

I think I'd also slightly prefer setcc(cpu, r) here ... but anyway:

#28 lore raw
In reply to Janosch Frank
Quoted 17 lines · On Wed, 27 Nov 2019 12:50:40 -0500 Janosch Frank <[email protected]> wrote:

Adding comments and reordering code for better readability in the diag308 and machine reset functions. Also making the kvm sclp function void and refactoring it.

v4
* Added sclp cleanup
* Renamed ccpu reset wrapper
* Added assert to cpu reset function

Janosch Frank (6):
s390x: Don't do a normal reset on the initial cpu
s390x: Move reset normal to shared reset handler
s390x: Move initial reset
s390x: Move clear reset
s390x: Beautify diag308 handling
s390x: kvm: Make kvm_sclp_service_call void

Quoted 9 lines
 hw/s390x/s390-virtio-ccw.c |   3 ++
 target/s390x/cpu-qom.h     |   9 +++-
 target/s390x/cpu.c         | 107 ++++++++++++++-----------------------
 target/s390x/cpu.h         |   4 +-
 target/s390x/diag.c        |  54 +++++++++++--------
 target/s390x/kvm.c         |  12 ++---
 target/s390x/sigp.c        |   4 +-
 7 files changed, 91 insertions(+), 102 deletions(-)

Thanks, applied.