qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling
@ 2018-02-02  9:42 Christian Borntraeger
  2018-02-02  9:43 ` Christian Borntraeger
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Christian Borntraeger @ 2018-02-02  9:42 UTC (permalink / raw)
  To: qemu-s390x
  Cc: qemu-devel, Halil Pasic, Claudio Imbrenda, Christian Borntraeger,
	Cornelia Huck, Jason J. Herne, qemu-stable

commit 67915de9f038 ("s390x/event-facility: variable-length event
masks") switches the sclp receive/send mask. This broke the sclp
lm console.

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>
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));
 
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling
  2018-02-02  9:42 [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling Christian Borntraeger
@ 2018-02-02  9:43 ` Christian Borntraeger
  2018-02-02 10:33   ` Cornelia Huck
  2018-02-02 14:10 ` [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling Claudio Imbrenda
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 10+ messages in thread
From: Christian Borntraeger @ 2018-02-02  9:43 UTC (permalink / raw)
  To: qemu-s390x
  Cc: qemu-devel, Halil Pasic, Claudio Imbrenda, Cornelia Huck,
	Jason J. Herne, qemu-stable, Cornelia Huck



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.
> 
> 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 :-)

> 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));
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling
  2018-02-02  9:43 ` Christian Borntraeger
@ 2018-02-02 10:33   ` Cornelia Huck
  2018-02-02 10:35     ` Cornelia Huck
  0 siblings, 1 reply; 10+ messages in thread
From: Cornelia Huck @ 2018-02-02 10:33 UTC (permalink / raw)
  To: Christian Borntraeger
  Cc: qemu-s390x, qemu-devel, Halil Pasic, Claudio Imbrenda,
	Cornelia Huck, Jason J. Herne, qemu-stable

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.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling
  2018-02-02 10:33   ` Cornelia Huck
@ 2018-02-02 10:35     ` Cornelia Huck
  2018-02-08 11:30       ` [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling --> stable 2.11.1? Christian Borntraeger
  0 siblings, 1 reply; 10+ messages in thread
From: Cornelia Huck @ 2018-02-02 10:35 UTC (permalink / raw)
  To: Christian Borntraeger
  Cc: qemu-s390x, qemu-devel, Halil Pasic, Claudio Imbrenda,
	Cornelia Huck, Jason J. Herne, qemu-stable

On Fri, 2 Feb 2018 11:33:01 +0100
Cornelia Huck <cohuck@redhat.com> wrote:

> 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.

Oh, and as always, I still take R-bs until I prepare a pull req.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling
  2018-02-02  9:42 [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling Christian Borntraeger
  2018-02-02  9:43 ` Christian Borntraeger
@ 2018-02-02 14:10 ` Claudio Imbrenda
  2018-02-05  8:30 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
  2018-02-05  8:32 ` [Qemu-devel] " Christian Borntraeger
  3 siblings, 0 replies; 10+ messages in thread
From: Claudio Imbrenda @ 2018-02-02 14:10 UTC (permalink / raw)
  To: Christian Borntraeger
  Cc: qemu-s390x, qemu-devel, Halil Pasic, Cornelia Huck,
	Jason J. Herne, qemu-stable

On Fri,  2 Feb 2018 09:42:41 +0000
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> commit 67915de9f038 ("s390x/event-facility: variable-length event
> masks") switches the sclp receive/send mask. This broke the sclp
> lm console.

Reviewed-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
 
> 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>
> 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));
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [qemu-s390x] [PATCH] s390x/sclp: fix event mask handling
  2018-02-02  9:42 [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling Christian Borntraeger
  2018-02-02  9:43 ` Christian Borntraeger
  2018-02-02 14:10 ` [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling Claudio Imbrenda
@ 2018-02-05  8:30 ` David Hildenbrand
  2018-02-05  8:32 ` [Qemu-devel] " Christian Borntraeger
  3 siblings, 0 replies; 10+ messages in thread
From: David Hildenbrand @ 2018-02-05  8:30 UTC (permalink / raw)
  To: Christian Borntraeger, qemu-s390x
  Cc: Halil Pasic, qemu-stable, qemu-devel, Claudio Imbrenda,
	Jason J. Herne, Cornelia Huck

On 02.02.2018 10:42, Christian Borntraeger wrote:
> commit 67915de9f038 ("s390x/event-facility: variable-length event
> masks") switches the sclp receive/send mask. This broke the sclp
> lm console.
> 
> 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>
> 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));
>  
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 

Thanks,

David / dhildenb

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling
  2018-02-02  9:42 [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling Christian Borntraeger
                   ` (2 preceding siblings ...)
  2018-02-05  8:30 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
@ 2018-02-05  8:32 ` Christian Borntraeger
  3 siblings, 0 replies; 10+ messages in thread
From: Christian Borntraeger @ 2018-02-05  8:32 UTC (permalink / raw)
  To: qemu-s390x
  Cc: qemu-devel, Halil Pasic, Claudio Imbrenda, Cornelia Huck,
	Jason J. Herne, qemu-stable



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
	  switched

> lm console.
> 
> 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>
> 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));
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling --> stable 2.11.1?
  2018-02-02 10:35     ` Cornelia Huck
@ 2018-02-08 11:30       ` Christian Borntraeger
  2018-02-08 11:53         ` Cornelia Huck
  2018-02-09 13:35         ` Cornelia Huck
  0 siblings, 2 replies; 10+ messages in thread
From: Christian Borntraeger @ 2018-02-08 11:30 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: qemu-s390x, qemu-devel, Halil Pasic, Claudio Imbrenda,
	Cornelia Huck, Jason J. Herne, qemu-stable, Michael Roth



On 02/02/2018 11:35 AM, Cornelia Huck wrote:
> On Fri, 2 Feb 2018 11:33:01 +0100
> Cornelia Huck <cohuck@redhat.com> wrote:
> 
>> 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.
> 
> 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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling --> stable 2.11.1?
  2018-02-08 11:30       ` [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling --> stable 2.11.1? Christian Borntraeger
@ 2018-02-08 11:53         ` Cornelia Huck
  2018-02-09 13:35         ` Cornelia Huck
  1 sibling, 0 replies; 10+ messages in thread
From: Cornelia Huck @ 2018-02-08 11:53 UTC (permalink / raw)
  To: Christian Borntraeger
  Cc: qemu-s390x, qemu-devel, Halil Pasic, Claudio Imbrenda,
	Cornelia Huck, Jason J. Herne, qemu-stable, Michael Roth

On Thu, 8 Feb 2018 12:30:28 +0100
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> On 02/02/2018 11:35 AM, Cornelia Huck wrote:
> > On Fri, 2 Feb 2018 11:33:01 +0100
> > Cornelia Huck <cohuck@redhat.com> wrote:
> >   
> >> 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.  
> > 
> > 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?

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling --> stable 2.11.1?
  2018-02-08 11:30       ` [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling --> stable 2.11.1? Christian Borntraeger
  2018-02-08 11:53         ` Cornelia Huck
@ 2018-02-09 13:35         ` Cornelia Huck
  1 sibling, 0 replies; 10+ messages in thread
From: Cornelia Huck @ 2018-02-09 13:35 UTC (permalink / raw)
  To: Christian Borntraeger
  Cc: qemu-s390x, qemu-devel, Halil Pasic, Claudio Imbrenda,
	Cornelia Huck, Jason J. Herne, qemu-stable, Michael Roth

On Thu, 8 Feb 2018 12:30:28 +0100
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> On 02/02/2018 11:35 AM, Cornelia Huck wrote:
> > On Fri, 2 Feb 2018 11:33:01 +0100
> > Cornelia Huck <cohuck@redhat.com> wrote:
> >   
> >> 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.  
> > 
> > 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
> 

FYI, this is now in master as commit 869e676ae7c7ef678292652be8995a525e642bee

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2018-02-09 13:35 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-02  9:42 [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling Christian Borntraeger
2018-02-02  9:43 ` Christian Borntraeger
2018-02-02 10:33   ` Cornelia Huck
2018-02-02 10:35     ` Cornelia Huck
2018-02-08 11:30       ` [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling --> stable 2.11.1? Christian Borntraeger
2018-02-08 11:53         ` Cornelia Huck
2018-02-09 13:35         ` Cornelia Huck
2018-02-02 14:10 ` [Qemu-devel] [PATCH] s390x/sclp: fix event mask handling Claudio Imbrenda
2018-02-05  8:30 ` [Qemu-devel] [qemu-s390x] " David Hildenbrand
2018-02-05  8:32 ` [Qemu-devel] " Christian Borntraeger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).