From patchwork Thu Jun 13 11:43:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 251057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BF3342C00A2 for ; Thu, 13 Jun 2013 21:43:47 +1000 (EST) Received: from localhost ([::1]:56624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un5wP-00041Y-JQ for incoming@patchwork.ozlabs.org; Thu, 13 Jun 2013 07:43:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un5w2-0003zN-1l for qemu-devel@nongnu.org; Thu, 13 Jun 2013 07:43:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Un5w0-0006jC-5Q for qemu-devel@nongnu.org; Thu, 13 Jun 2013 07:43:21 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:52735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un5vz-0006iL-SW for qemu-devel@nongnu.org; Thu, 13 Jun 2013 07:43:20 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 13 Jun 2013 12:38:18 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 13 Jun 2013 12:38:16 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id E4ED31B08061; Thu, 13 Jun 2013 12:43:14 +0100 (BST) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5DBh3wW54591612; Thu, 13 Jun 2013 11:43:03 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r5DBhDXn006539; Thu, 13 Jun 2013 05:43:14 -0600 Received: from gondolin.boeblingen.de.ibm.com (dyn-9-152-224-40.boeblingen.de.ibm.com [9.152.224.40]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r5DBhDIX006525; Thu, 13 Jun 2013 05:43:13 -0600 From: Cornelia Huck To: qemu-devel Date: Thu, 13 Jun 2013 13:43:12 +0200 Message-Id: <1371123792-14031-2-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371123792-14031-1-git-send-email-cornelia.huck@de.ibm.com> References: <1371123792-14031-1-git-send-email-cornelia.huck@de.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13061311-5024-0000-0000-00000650FB99 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.107 Cc: Christian Borntraeger , qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH] s390/virtio-ccw: Fix virtio reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Christian Borntraeger On virtio reset we must reset the indicator to avoid stale interrupts, e.g. after a reset. Signed-off-by: Christian Borntraeger Cc: qemu-stable@nongnu.org Signed-off-by: Cornelia Huck --- hw/s390x/virtio-ccw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 44f5772..4a45dc5 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -803,6 +803,8 @@ static void virtio_ccw_reset(DeviceState *d) virtio_reset(dev->vdev); css_reset_sch(dev->sch); + dev->indicators = 0; + dev->indicators2 = 0; } /**************** Virtio-ccw Bus Device Descriptions *******************/