Re: [PATCH 2/9] target/s390x: Factor diag_iplb_read() out

[Thomas Huth]

On 02/10/2025 11.11, Philippe Mathieu-Daudé wrote:

This patch is also missing a proper reasoning in the patch description.

 Thomas

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
  target/s390x/diag.c | 31 +++++++++++++++++++------------
  1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index ed320fc0c1f..c2fedc55213 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -73,6 +73,24 @@ static int diag308_parm_check(CPUS390XState *env, uint64_t 
r1, uint64_t addr,
      return 0;
  }

+static bool diag_iplb_read(IplParameterBlock *iplb, S390CPU *cpu, uint64_t addr)

+{
+    if (s390_is_pv()) {
+        s390_cpu_pv_mem_read(cpu, 0, iplb, sizeof(iplb->len));
+        if (!iplb_valid_len(iplb)) {
+            return false;
+        }
+        s390_cpu_pv_mem_read(cpu, 0, iplb, be32_to_cpu(iplb->len));
+    } else {
+        cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
+        if (!iplb_valid_len(iplb)) {
+            return false;
+        }
+        cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
+    }
+    return true;
+}
+
  static void diag_iplb_write(IplParameterBlock *iplb, S390CPU *cpu, uint64_t 
addr)
  {
      const size_t iplb_len = be32_to_cpu(iplb->len);
@@ -125,23 +143,12 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, 
uint64_t r3, uintptr_t ra)
              return;
          }
          iplb = g_new0(IplParameterBlock, 1);
-        if (!s390_is_pv()) {
-            cpu_physical_memory_read(addr, iplb, sizeof(iplb->len));
-        } else {
-            s390_cpu_pv_mem_read(cpu, 0, iplb, sizeof(iplb->len));
-        }

- if (!iplb_valid_len(iplb)) {

+        if (!diag_iplb_read(iplb, cpu, addr)) {
              env->regs[r1 + 1] = DIAG_308_RC_INVALID;
              goto out;
          }

- if (!s390_is_pv()) {

-            cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));
-        } else {
-            s390_cpu_pv_mem_read(cpu, 0, iplb, be32_to_cpu(iplb->len));
-        }
-
          valid = subcode == DIAG308_PV_SET ? iplb_valid_pv(iplb) : 
iplb_valid(iplb);
          if (!valid) {
              if (subcode == DIAG308_SET && iplb->pbt == 
S390_IPL_TYPE_QEMU_SCSI) {