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
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)); >
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.
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.
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
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?
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
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)); >
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
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)); >
© 2016 - 2024 Red Hat, Inc.