From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejklw-0007We-GE for qemu-devel@nongnu.org; Thu, 08 Feb 2018 06:53:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejklt-0006Ny-En for qemu-devel@nongnu.org; Thu, 08 Feb 2018 06:53:48 -0500 Date: Thu, 8 Feb 2018 12:53:24 +0100 From: Cornelia Huck Message-ID: <20180208125324.40e3c26e.cohuck@redhat.com> In-Reply-To: <47ffc4f7-a66b-0328-d0bf-2d06ad0f7c30@de.ibm.com> References: <20180202094241.59537-1-borntraeger@de.ibm.com> <8d3af693-3dd8-20b7-c7c1-38d7c6cce65d@de.ibm.com> <20180202113301.0522c7bc.cohuck@redhat.com> <20180202113513.15c37b32.cohuck@redhat.com> <47ffc4f7-a66b-0328-d0bf-2d06ad0f7c30@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling --> stable 2.11.1? List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Halil Pasic , Claudio Imbrenda , Cornelia Huck , "Jason J. Herne" , qemu-stable@nongnu.org, Michael Roth On Thu, 8 Feb 2018 12:30:28 +0100 Christian Borntraeger wrote: > On 02/02/2018 11:35 AM, Cornelia Huck wrote: > > On Fri, 2 Feb 2018 11:33:01 +0100 > > Cornelia Huck wrote: > > > >> On Fri, 2 Feb 2018 10:43:18 +0100 > >> Christian Borntraeger wrote: > >> > >>> On 02/02/2018 10:42 AM, Christian Borntraeger wrote: > >>>> commit 67915de9f038 ("s390x/event-facility: variable-length event > >>>> masks") switches the sclp receive/send mask. This broke the sclp > >>>> lm console. > >> > >> Hum. Probably should add sclp-lm to my test setup. > >> > >>>> > >>>> Signed-off-by: Christian Borntraeger > >>>> Fixes: commit 67915de9f038 ("s390x/event-facility: variable-length event masks") > >>>> Cc: Cornelia Huck > >>> > >>> opps. Please fixup yourself Conny :-) > >> > >> Well, you did cc: the original author :) > >> > >>> > >>>> Cc: Jason J. Herne > >>>> Cc: qemu-stable@nongnu.org > >>>> --- > >>>> hw/s390x/event-facility.c | 4 ++-- > >>>> 1 file changed, 2 insertions(+), 2 deletions(-) > >>>> > >>>> diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c > >>>> index b0f71f4554..155a69467b 100644 > >>>> --- a/hw/s390x/event-facility.c > >>>> +++ b/hw/s390x/event-facility.c > >>>> @@ -293,10 +293,10 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb) > >>>> ef->receive_mask = be32_to_cpu(tmp_mask); > >>>> > >>>> /* return the SCLP's capability masks to the guest */ > >>>> - tmp_mask = cpu_to_be32(get_host_send_mask(ef)); > >>>> + tmp_mask = cpu_to_be32(get_host_receive_mask(ef)); > >>>> copy_mask(WEM_RECEIVE_MASK(we_mask, mask_length), (uint8_t *)&tmp_mask, > >>>> mask_length, sizeof(tmp_mask)); > >>>> - tmp_mask = cpu_to_be32(get_host_receive_mask(ef)); > >>>> + tmp_mask = cpu_to_be32(get_host_send_mask(ef)); > >>>> copy_mask(WEM_SEND_MASK(we_mask, mask_length), (uint8_t *)&tmp_mask, > >>>> mask_length, sizeof(tmp_mask)); > >>>> > >>> > >> > >> Thanks, applied. > > > > Oh, and as always, I still take R-bs until I prepare a pull req. > > > > Would be good to have that in 2.11.1 stable as well I think > FWIW, this is queued in s390-next and will go into a pull request in the next days. Not sure if anything else is needed?