From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWN30-0006wf-OH for qemu-devel@nongnu.org; Mon, 31 Aug 2015 07:14:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZWN2w-0006Th-Mt for qemu-devel@nongnu.org; Mon, 31 Aug 2015 07:14:46 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:36297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZWN2w-0006TL-Da for qemu-devel@nongnu.org; Mon, 31 Aug 2015 07:14:42 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 31 Aug 2015 12:14:34 +0100 From: Cornelia Huck Date: Mon, 31 Aug 2015 13:13:44 +0200 Message-Id: <1441019643-10677-5-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1441019643-10677-1-git-send-email-cornelia.huck@de.ibm.com> References: <1441019643-10677-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH 04/23] s390x/css: start with cleared cstat/dstat List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, agraf@suse.de, qemu-stable@nongnu.org When executing the start function, we should start with a clear state regarding subchannel and device status; it is easy to forget updating one of them after the ccw has been processed. Note that we don't need to care about resetting the various control fields: They are cleared by tsch(), and if they were still pending, we wouldn't be able to execute the start function in the first place. Also note that we don't want to clear cstat/dstat if a suspended subchannel is resumed. This fixes a bug where we would continue to present channel-program check in cstat even though later ccw requests for the subchannel finished without error (i.e. cstat should be 0). Cc: qemu-stable@nongnu.org Signed-off-by: Cornelia Huck Reviewed-by: David Hildenbrand --- hw/s390x/css.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 9596280..c033612 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -399,6 +399,8 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb) path = 0x80; if (!(s->ctrl & SCSW_ACTL_SUSP)) { + s->cstat = 0; + s->dstat = 0; /* Look at the orb and try to execute the channel program. */ assert(orb != NULL); /* resume does not pass an orb */ p->intparm = orb->intparm; -- 2.5.1