diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2018-05-03 16:32:41 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2018-05-03 16:33:01 +0200 |
| commit | 532cd4b067d37b96496dbacbfab6c990c063d33d (patch) | |
| tree | ea2e79127799f4c8220349daa2a13c753817910a /hw | |
| parent | 052888f043bacb18231046045b1f9cd946703170 (diff) | |
| parent | 312185cf35b5d8454a84c337ef9aadade877fb88 (diff) | |
| download | qemu-532cd4b067d37b96496dbacbfab6c990c063d33d.tar.gz | |
Merge tag 'tags/s390x-2018-05-02' into staging
s390-ccw firmware updates:
- Improvements to the boot menu (can now handle non-sequential entries)
- s390-netboot now resets the machine before jumping into the OS kernel
- s390-netboot now supports indirect loading via .INS files
- some other minor fixes and clean-ups
# gpg: Signature made Wed 02 May 2018 04:15:21 PM CEST
# gpg: using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
* tag 'tags/s390x-2018-05-02':
pc-bios/s390: Update firmware images
s390-ccw: force diag 308 subcode to unsigned long
pc-bios/s390-ccw/net: Add support for .INS config files
pc-bios/s390-ccw/net: Use diag308 to reset machine before jumping to the OS
pc-bios/s390-ccw/net: Split up net_load() into init, load and release parts
pc-bios/s390-ccw: fix non-sequential boot entries (enum)
pc-bios/s390-ccw: fix non-sequential boot entries (eckd)
pc-bios/s390-ccw: fix loadparm initialization and int conversion
pc-bios/s390-ccw: rename MAX_TABLE_ENTRIES to MAX_BOOT_ENTRIES
pc-bios/s390-ccw: size_t should be unsigned
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/ipl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index fb554ab156..150f6c0582 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -373,6 +373,10 @@ int s390_ipl_set_loadparm(uint8_t *loadparm) loadparm[i] = ascii2ebcdic[(uint8_t) lp[i]]; } + if (i < 8) { + memset(loadparm + i, 0x40, 8 - i); /* fill with EBCDIC spaces */ + } + g_free(lp); return 0; } |