qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cornelia Huck <cohuck@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
	borntraeger@de.ibm.com, rth@twiddle.net, agraf@suse.de,
	david@redhat.com, thuth@redhat.com,
	Cornelia Huck <cohuck@redhat.com>,
	"Jason J . Herne" <jjherne@linux.vnet.ibm.com>,
	qemu-stable@nongnu.org
Subject: [Qemu-devel] [PULL 20/29] s390x/sclp: fix event mask handling
Date: Fri,  9 Feb 2018 10:25:15 +0100	[thread overview]
Message-ID: <20180209092524.31348-21-cohuck@redhat.com> (raw)
In-Reply-To: <20180209092524.31348-1-cohuck@redhat.com>

From: Christian Borntraeger <borntraeger@de.ibm.com>

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 <borntraeger@de.ibm.com>
Fixes: commit 67915de9f038 ("s390x/event-facility: variable-length event masks")
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Cc: qemu-stable@nongnu.org
Message-Id: <20180202094241.59537-1-borntraeger@de.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 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.13.6

  parent reply	other threads:[~2018-02-09  9:26 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-09  9:24 [Qemu-devel] [PULL 00/29] s390x: assorted updates Cornelia Huck
2018-02-09  9:24 ` [Qemu-devel] [PULL 01/29] Fix configure for s390 qemu on alpine and other busybox environments Cornelia Huck
2018-02-09  9:24 ` [Qemu-devel] [PULL 02/29] s390x/tcg: deliver multiple interrupts in a row Cornelia Huck
2018-02-09  9:24 ` [Qemu-devel] [PULL 03/29] s390x/flic: simplify flic initialization Cornelia Huck
2018-02-09  9:24 ` [Qemu-devel] [PULL 04/29] s390x/tcg: simplify lookup of flic Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 05/29] s390x/tcg: simplify machine check handling Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 06/29] s390x/flic: factor out injection of floating interrupts Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 07/29] s390x/flic: no need to call s390_io_interrupt() from flic Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 08/29] s390x/tcg: tolerate wrong wakeups due to floating interrupts Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 09/29] s390x/flic: make floating interrupts on TCG actually floating Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 10/29] s390x/tcg: implement TEST PENDING INTERRUPTION Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 11/29] s390x/flic: implement qemu_s390_clear_io_flic() Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 12/29] s390x/flic: optimize CPU wakeup for TCG Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 13/29] s390x: fix size + content of STSI blocks Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 14/29] s390x/tcg: STSI overhaul Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 15/29] s390x/tcg: remove SMP warning Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 16/29] configure: s390x supports mttcg now Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 17/29] s390x/tcg: cache the qemu flic in a central function Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 18/29] s390x/kvm: cache the kvm " Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 19/29] s390x/flic: cache the common flic class " Cornelia Huck
2018-02-09  9:25 ` Cornelia Huck [this message]
2018-02-09  9:25 ` [Qemu-devel] [PULL 21/29] s390x/tcg: wire up pci instructions Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 22/29] s390x/cpumodel: allow zpci features in qemu model Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 23/29] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 24/29] s390x/pci: fixup the code walking IOMMU tables Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 25/29] s390x/pci: fixup global refresh Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 26/29] s390x/pci: use the right pal and pba in reg_ioat() Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 27/29] MAINTAINERS: add myself as overall s390x maintainer Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 28/29] MAINTAINERS: reorganize s390-ccw bios maintainership Cornelia Huck
2018-02-09  9:25 ` [Qemu-devel] [PULL 29/29] MAINTAINERS: add David as additional tcg/s390 maintainer Cornelia Huck
2018-02-09  9:59 ` [Qemu-devel] [PULL 00/29] s390x: assorted updates no-reply
2018-02-09 13:27 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180209092524.31348-21-cohuck@redhat.com \
    --to=cohuck@redhat.com \
    --cc=agraf@suse.de \
    --cc=borntraeger@de.ibm.com \
    --cc=david@redhat.com \
    --cc=jjherne@linux.vnet.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).