diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-29 11:41:54 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-29 11:41:55 +0000 |
| commit | b944295090e9cad3d159dde480ca85756d3c574b (patch) | |
| tree | 9cca7df07e4a0228ee44beb17b04df83d73bd61c | |
| parent | 1a61a081ac33ae6cb7dd2e38d119a572f416c7f7 (diff) | |
| parent | bf876a688c9319b506d5ff1175ba7189cd933d91 (diff) | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-11-29' into staging
A fix for regression in the s390-ccw bios
# gpg: Signature made Fri 29 Nov 2019 09:26:51 GMT
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2019-11-29:
pc-bios/s390: Update firmware image with the "fix sclp_get_loadparm_ascii" patch
pc-bios/s390-ccw: fix sclp_get_loadparm_ascii
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | pc-bios/s390-ccw.img | bin | 42608 -> 42608 bytes | |||
| -rw-r--r-- | pc-bios/s390-ccw/sclp.c | 2 | ||||
| -rw-r--r-- | pc-bios/s390-netboot.img | bin | 67232 -> 67232 bytes |
3 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img Binary files differindex a0234bf748..c84ae93561 100644 --- a/pc-bios/s390-ccw.img +++ b/pc-bios/s390-ccw.img diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c index c0223fab0b..7251f9af4d 100644 --- a/pc-bios/s390-ccw/sclp.c +++ b/pc-bios/s390-ccw/sclp.c @@ -112,7 +112,7 @@ void sclp_get_loadparm_ascii(char *loadparm) ReadInfo *sccb = (void *)_sccb; memset((char *)_sccb, 0, sizeof(ReadInfo)); - sccb->h.length = sizeof(ReadInfo); + sccb->h.length = SCCB_SIZE; if (!sclp_service_call(SCLP_CMDW_READ_SCP_INFO, sccb)) { ebcdic_to_ascii((char *) sccb->loadparm, loadparm, LOADPARM_LEN); } diff --git a/pc-bios/s390-netboot.img b/pc-bios/s390-netboot.img Binary files differindex b984ad0da0..f9ef28ef1a 100644 --- a/pc-bios/s390-netboot.img +++ b/pc-bios/s390-netboot.img |