xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-12-03 17:11:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A fix for regression in the s390-ccw bios

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAl3g5FsRHHRodXRoQHJl
 ZGhhdC5jb20ACgkQLtnXdP5wLbXH8Q//X2+FcS42xJ3ND+vKThQVp8lsXo3NvGzD
 mOrOqSplx47qFdbNlvM+UT9vvP82K9fQtOK/2KFDpnO2+zKJLcqeQBBdo5faJqgw
 MO7Xdr6Yi1Xh/eQYdE6mP3kCeQ96ZMp9HrGgHPtCHck4vFbotYH8UjvSK/vEqvt3
 AN/zBVXC0aoAoD0SSWVGCVH5yiglnRISlKFVwxncQeWWIlrCmBSRIwy9z+ZYQYxQ
 rGDbKOejv2xDKF8SwNITjC2lPFZqJT8+eWjoqQ8tppoUBJnjiWQw8VxWI/ivfPX9
 W9pLv0X97mvCdUtuuhPaZVl5bWXWSPAWIq7z6SeuxluPQlj8VT2jIi0apgEchNnp
 kXSQgMOTtKB/XFkA0NiRVtUpGkZ8wly/u7w6F05zjdkenMq2SrKSk+30j22TCh9y
 fYh1KMAKFEECObzGbkcsctJ4uzh+rG6ehecDyAKirQvhcyDsiRoXsDyYGS5oBXb1
 gZoe4SPQRbcpVYDbah6CFzCBAzuBBV4JfWBOHMntS5QOnO13+mSxC9lXa1mMYGi2
 fqS0JzpnsGAR5Uyb3XAurvJw7gE2XSOGS0XZanisyjlFbDSwVJjy2wkB3ofwz4xo
 weYpAEfSvqHcuxfExeTDwWHb4B5FGwzb7V4lOtgqqDwDs55wZ//lmw+7A2veyh+Q
 jWAQ3TYovX0=
 =NzmB
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2019-11-29 11:41:54 +00:00
commit b944295090
3 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pc-bios/s390-ccw.img
View File

Binary file not shown.

2
pc-bios/s390-ccw/sclp.c
View File

@ -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);
}

BIN
pc-bios/s390-netboot.img
View File

Binary file not shown.