[Qemu-commits] [qemu/qemu] f24ec9: pc-bios/s390-ccw: fix sclp_get_loadparm_ascii

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f24ec9feadfed032a91e06cb3c564db533d5ff11
      
https://github.com/qemu/qemu/commit/f24ec9feadfed032a91e06cb3c564db533d5ff11
  Author: Claudio Imbrenda <address@hidden>
  Date:   2019-11-29 (Fri, 29 Nov 2019)

  Changed paths:
    M pc-bios/s390-ccw/sclp.c

  Log Message:
  -----------
  pc-bios/s390-ccw: fix sclp_get_loadparm_ascii

The existing s390 bios gets the LOADPARM information from the system using
an SCLP call that specifies a buffer length too small to contain all the
output.

The recent fixes in the SCLP code have exposed this bug, since now the
SCLP call will return an error (as per architecture) instead of
writing partially and completing successfully.

The solution is simply to specify the full page length as the SCCB
length instead of a smaller size.

Fixes: 832be0d8a3bb ("s390x: sclp: Report insufficient SCCB length")
Fixes: 9a22473c70f3 ("pc-bios/s390-ccw: get LOADPARM stored in SCP Read Info")

Reported-by: Marc Hartmayer <address@hidden>
Signed-off-by: Claudio Imbrenda <address@hidden>
Message-Id: <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Janosch Frank <address@hidden>
Tested-by: Marc Hartmayer <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>


  Commit: bf876a688c9319b506d5ff1175ba7189cd933d91
      
https://github.com/qemu/qemu/commit/bf876a688c9319b506d5ff1175ba7189cd933d91
  Author: Thomas Huth <address@hidden>
  Date:   2019-11-29 (Fri, 29 Nov 2019)

  Changed paths:
    M pc-bios/s390-ccw.img
    M pc-bios/s390-netboot.img

  Log Message:
  -----------
  pc-bios/s390: Update firmware image with the "fix sclp_get_loadparm_ascii" 
patch

This fixes various boot scenarios, e.g. the possibility to use
"-boot menu=on".

Signed-off-by: Thomas Huth <address@hidden>


  Commit: b944295090e9cad3d159dde480ca85756d3c574b
      
https://github.com/qemu/qemu/commit/b944295090e9cad3d159dde480ca85756d3c574b
  Author: Peter Maydell <address@hidden>
  Date:   2019-11-29 (Fri, 29 Nov 2019)

  Changed paths:
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/sclp.c
    M pc-bios/s390-netboot.img

  Log Message:
  -----------
  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 "address@hidden"
# gpg: Good signature from "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [full]
# gpg:                 aka "Thomas Huth <address@hidden>" [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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1a61a081ac33...b944295090e9