diff options
| author | Halil Pasic <pasic@linux.vnet.ibm.com> | 2016-01-20 19:51:30 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2016-03-17 16:42:26 -0500 |
| commit | 091af181047623695b7239cd8ddf928e1327b6a5 (patch) | |
| tree | 546874ecbf323eb9592497242960ee886344d1c3 | |
| parent | d98392379ac3ac3e2a7ef2df5b300883beb3fe9e (diff) | |
| download | qemu-091af181047623695b7239cd8ddf928e1327b6a5.zip qemu-091af181047623695b7239cd8ddf928e1327b6a5.tar.gz qemu-091af181047623695b7239cd8ddf928e1327b6a5.tar.bz2 | |
s390x/css: fix control flags during csch
From the beginning, css support contained an error in csch handling:
instead of setting the clear bit in the function control bits twice, we
need to set the clear pending bit in the activity control bits. Let's
fix this.
Cc: qemu-stable@nongnu.org
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
(cherry picked from commit 4c6bf79a222934ac9ff0e45fc98ea1c986ed5c67)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/s390x/css.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 19851ce..c6ca8be 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -701,7 +701,7 @@ int css_do_csch(SubchDev *sch) /* Trigger the clear function. */ s->ctrl &= ~(SCSW_CTRL_MASK_FCTL | SCSW_CTRL_MASK_ACTL); - s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_FCTL_CLEAR_FUNC; + s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_ACTL_CLEAR_PEND; do_subchannel_work(sch, NULL); ret = 0; |