Received: by 10.192.165.156 with SMTP id m28csp804891imm; Thu, 19 Apr 2018 07:51:50 -0700 (PDT) X-Google-Smtp-Source: AIpwx49M1INappEbg8cGETOit7HfJBR1c9dkNNzERi0Ik48AV47B1rx7v+O/RowdpaUTqJ1ybTFH X-Received: by 10.101.96.141 with SMTP id t13mr5489337pgu.222.1524149510182; Thu, 19 Apr 2018 07:51:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524149510; cv=none; d=google.com; s=arc-20160816; b=qfGZbXZxMP0lExlz2GaXkie/iR/YhemL6qVDo1QnywNnJA4cxkjByAn6be6VaGeBox qD90l+UpqG1C6U9J/HnyqkxibgNtLlsRV+lX/rPPxdLI3zByJxRPGccDiFPmEAi1sER3 briL+1Uxo87XSaHXcJTQXVohjwyZC3ZnEVpOktzV6QuMmeuopUksfWipNcYY7Qn3mS+7 eLvf5KR+ZvGr62FUjSmW7g9lUi1XCIaWMUmJXbFL3biBmi59APLTq1+uUMaxYUJurKPk XHrgxbnwqZALKssi4civ3HYXLpXJdjeql9FaYgWbxXQxh37Bmwzue2/pgxxkvUNiGvNq haiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from:arc-authentication-results; bh=paRI1ajf2CvyePXa38GK4EQCn3advEl0hBGtdWXzHPg=; b=WOQei1aPjxLNGUysnY6J9KTWJvgfSBqnAvN6S3V8Kr4n9MXYjwDKp0kWbY3ZX2tj+e NCRrAl6jkUWKMR8NBpsamr2hNm7WUNhLbHWt4zx9I0FITt+b8hzmaxxgd1yxEDX10u1c A92V+FAagWieIeJTgEXZL9SSzh+xbJdrb8sgfs/O7SLY3J9upVLIsQHn/5cYoq94VHs2 +ykaDKlqR43YiiEgnYho8iJ19gpJCwN1jQ8UMgqBgi/r0PeJPQmgnYMJPsc7ko9x7fju evlrBDaRkB8/RGYmpNpTogleT4uka6pbr2+SKGo2xokbA5hN8FvggIl1tcXsCzT0JpHe 3XEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f3si3147629pgr.572.2018.04.19.07.51.35; Thu, 19 Apr 2018 07:51:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753827AbeDSOuC (ORCPT + 99 others); Thu, 19 Apr 2018 10:50:02 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:49586 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753435AbeDSOt5 (ORCPT ); Thu, 19 Apr 2018 10:49:57 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w3JEnWfl190681 for ; Thu, 19 Apr 2018 10:49:57 -0400 Received: from e06smtp10.uk.ibm.com (e06smtp10.uk.ibm.com [195.75.94.106]) by mx0b-001b2d01.pphosted.com with ESMTP id 2hetqx07fm-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Thu, 19 Apr 2018 10:49:45 -0400 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 19 Apr 2018 15:48:29 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 19 Apr 2018 15:48:25 +0100 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w3JEmPHM58392618; Thu, 19 Apr 2018 14:48:25 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AEDF152054; Thu, 19 Apr 2018 14:39:11 +0100 (BST) Received: from morel-ThinkPad-W530.boeblingen.de.ibm.com (unknown [9.152.224.146]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 73F0F5203F; Thu, 19 Apr 2018 14:39:11 +0100 (BST) From: Pierre Morel To: pasic@linux.vnet.ibm.com, bjsdjshi@linux.vnet.ibm.com Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, cohuck@redhat.com Subject: [PATCH 09/10] vfio: ccw: Suppressing the BOXED state Date: Thu, 19 Apr 2018 16:48:12 +0200 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524149293-12658-1-git-send-email-pmorel@linux.vnet.ibm.com> References: <1524149293-12658-1-git-send-email-pmorel@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18041914-0040-0000-0000-00000430CE35 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18041914-0041-0000-0000-00002634E5E6 Message-Id: <1524149293-12658-10-git-send-email-pmorel@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-19_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804190131 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org VFIO_CCW_STATE_BOXED and VFIO_CCW_STATE_BUSY are the same states. Let's only keep one: VFIO_CCW_STATE_BUSY Signed-off-by: Pierre Morel --- drivers/s390/cio/vfio_ccw_fsm.c | 9 --------- drivers/s390/cio/vfio_ccw_private.h | 1 - 2 files changed, 10 deletions(-) diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c index 444424e..b77b8ad 100644 --- a/drivers/s390/cio/vfio_ccw_fsm.c +++ b/drivers/s390/cio/vfio_ccw_fsm.c @@ -261,15 +261,6 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = { [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq, [VFIO_CCW_EVENT_SCH_EVENT] = fsm_sch_event, }, - [VFIO_CCW_STATE_BOXED] = { - [VFIO_CCW_EVENT_INIT] = fsm_nop, - [VFIO_CCW_EVENT_ONLINE] = fsm_nop, - [VFIO_CCW_EVENT_OFFLINE] = fsm_quiescing, - [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper, - [VFIO_CCW_EVENT_SSCH_REQ] = fsm_io_busy, - [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq, - [VFIO_CCW_EVENT_SCH_EVENT] = fsm_sch_event, - }, [VFIO_CCW_STATE_BUSY] = { [VFIO_CCW_EVENT_INIT] = fsm_nop, [VFIO_CCW_EVENT_ONLINE] = fsm_nop, diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h index e7ea076..dbef727 100644 --- a/drivers/s390/cio/vfio_ccw_private.h +++ b/drivers/s390/cio/vfio_ccw_private.h @@ -66,7 +66,6 @@ enum vfio_ccw_state { VFIO_CCW_STATE_NOT_OPER, VFIO_CCW_STATE_STANDBY, VFIO_CCW_STATE_IDLE, - VFIO_CCW_STATE_BOXED, VFIO_CCW_STATE_BUSY, VFIO_CCW_STATE_QUIESCING, /* last element! */ -- 2.7.4