Commit b9442950 authored Nov 29, 2019 by Peter Maydell

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>

parents 1a61a081 bf876a68

pc-bios/s390-ccw.img

(41.6 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

pc-bios/s390-ccw/sclp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

pc-bios/s390-netboot.img

(65.7 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file