[qemu-xen master] s390x/sclp: fix event mask handling

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

[qemu-xen master] s390x/sclp: fix event mask handling

commit b8aa511bc045bba085d9b557e869a16c1ee56491
Author:     Christian Borntraeger <[hidden email]>
AuthorDate: Fri Feb 2 10:43:18 2018 +0100
Commit:     Michael Roth <[hidden email]>
CommitDate: Sun Feb 11 20:27:04 2018 -0600

    s390x/sclp: fix event mask handling
    commit 67915de9f038 ("s390x/event-facility: variable-length event
    masks") switched the sclp receive/send mask. This broke the sclp
    lm console.
    Signed-off-by: Christian Borntraeger <[hidden email]>
    Fixes: commit 67915de9f038 ("s390x/event-facility: variable-length event masks")
    Cc: Cornelia Huck <[hidden email]>
    Cc: Jason J. Herne <[hidden email]>
    Cc: [hidden email]
    Message-Id: <[hidden email]>
    Reviewed-by: Claudio Imbrenda <[hidden email]>
    Reviewed-by: David Hildenbrand <[hidden email]>
    Signed-off-by: Cornelia Huck <[hidden email]>
    (cherry picked from commit 869e676ae7c7ef678292652be8995a525e642bee)
    Signed-off-by: Michael Roth <[hidden email]>
 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 b0f71f4..155a694 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));
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

Xen-changelog mailing list
[hidden email]