diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-06-25 09:55:55 +0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-10-21 12:21:30 +0200 |
| commit | feacc6c2c8fff037f67a89402b29923251833425 (patch) | |
| tree | caf18c2f3f11603d50a255d169aa1406270f2937 /target-s390x | |
| parent | 09c7f58ca9613ccfb1ca13031d0ff3b1794bd782 (diff) | |
| download | qemu-feacc6c2c8fff037f67a89402b29923251833425.zip | |
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 <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/misc_helper.c | 7 |
1 files changed, 2 insertions, 5 deletions
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: |