From feacc6c2c8fff037f67a89402b29923251833425 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Thu, 25 Jun 2015 09:55:55 +0200 Subject: s390x/ipl: we always have an ipl device Both s390 machines unconditionally create an ipl device, so no need to handle the missing case. Now we can also change s390_ipl_update_diag308() to return void. Reviewed-by: Cornelia Huck Acked-by: Christian Borntraeger Signed-off-by: David Hildenbrand Signed-off-by: Cornelia Huck --- target-s390x/misc_helper.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'target-s390x') diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 3a19e321c8..ddf2498a35 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -233,11 +233,8 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3) } iplb = g_malloc0(sizeof(struct IplParameterBlock)); cpu_physical_memory_read(addr, iplb, sizeof(struct IplParameterBlock)); - if (!s390_ipl_update_diag308(iplb)) { - env->regs[r1 + 1] = DIAG_308_RC_OK; - } else { - env->regs[r1 + 1] = DIAG_308_RC_INVALID; - } + s390_ipl_update_diag308(iplb); + env->regs[r1 + 1] = DIAG_308_RC_OK; g_free(iplb); return; case 6: -- cgit v1.2.1