Re: [PATCH v1 1/1] pc-bios/s390-ccw: fix sclp_get_loadparm_ascii

From: Thomas Huth <thuth@redhat.com>
To: Christian Borntraeger <borntraeger@de.ibm.com>,
	Claudio Imbrenda <imbrenda@linux.ibm.com>,
	qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, cohuck@redhat.com, frankja@linux.ibm.com,
	david@redhat.com
Subject: Re: [PATCH v1 1/1] pc-bios/s390-ccw: fix sclp_get_loadparm_ascii
Date: Thu, 28 Nov 2019 14:11:38 +0100	[thread overview]
Message-ID: <5f3f505a-7bcd-d8ee-a4df-c9bf658955af@redhat.com> (raw)
In-Reply-To: <52e295af-3b34-6cb7-ba52-a26ae70aebcd@de.ibm.com>

On 28/11/2019 13.35, Christian Borntraeger wrote:
> Ack.
> 
> Conny, I think this would be really nice to have for 4.2 (together with a bios rebuild)
> as this fixes a regression. Opinions?

If we do another rc of 4.2, I think we definitely want this to be 
included, otherwise quite a bunch of things don't work anymore as 
expected, e.g. "-boot menu=on"...

>> diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
>> index c0223fa..7251f9a 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);
>>       }

I gave it a quick try, and this fixes "-boot menu=on" for me, so:

Tested-by: Thomas Huth <thuth@redhat.com>