Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling

[Cornelia Huck <cohuck@redhat.com>]

On Fri, 2 Feb 2018 10:43:18 +0100
Christian Borntraeger <borntraeger@de.ibm.com> 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 <borntraeger@de.ibm.com>
> > Fixes: commit 67915de9f038 ("s390x/event-facility: variable-length event masks")
> > Cc: Cornelia Huck <cornelia.huck@de.ibm.com>  
> 
> opps. Please fixup yourself Conny :-)

Well, you did cc: the original author :)

> 
> > Cc: Jason J. Herne <jjherne@linux.vnet.ibm.com>
> > 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.