From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4SUY-0006U3-KA for qemu-devel@nongnu.org; Tue, 17 Oct 2017 10:05:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4SUU-0004Vk-Gx for qemu-devel@nongnu.org; Tue, 17 Oct 2017 10:05:10 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:45115 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4SUU-0004VW-9U for qemu-devel@nongnu.org; Tue, 17 Oct 2017 10:05:06 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v9HE4k3M092642 for ; Tue, 17 Oct 2017 10:05:01 -0400 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0b-001b2d01.pphosted.com with ESMTP id 2dnjt4291f-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 17 Oct 2017 10:05:01 -0400 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Oct 2017 15:04:59 +0100 From: Halil Pasic Date: Tue, 17 Oct 2017 16:04:47 +0200 In-Reply-To: <20171017140453.51099-1-pasic@linux.vnet.ibm.com> References: <20171017140453.51099-1-pasic@linux.vnet.ibm.com> Message-Id: <20171017140453.51099-2-pasic@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 1/7] s390x/css: be more consistent if broken beyond repair List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck , Dong Jia Shi Cc: Thomas Huth , Pierre Morel , qemu-devel@nongnu.org, Halil Pasic Calling do_subchannel_work with no function control flags set in SCSW is a programming error. Currently the handle this differently in do_subchannel_work_virtual and do_subchannel_work_passthrough. Let's be consistent and guard with a common assert against this programming error. Signed-off-by: Halil Pasic --- Already applied to Connies s390-next. Included for the sake of completenes (with) the old typo in the commit message. --- hw/s390x/css.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 35683d7954..aa233d5f8a 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -1245,9 +1245,6 @@ int do_subchannel_work_virtual(SubchDev *sch) } else if (s->ctrl & SCSW_FCTL_START_FUNC) { /* Triggered by both ssch and rsch. */ sch_handle_start_func_virtual(sch); - } else { - /* Cannot happen. */ - return 0; } css_inject_io_interrupt(sch); return 0; @@ -1255,22 +1252,17 @@ int do_subchannel_work_virtual(SubchDev *sch) int do_subchannel_work_passthrough(SubchDev *sch) { - int ret; + int ret = 0; SCSW *s = &sch->curr_status.scsw; if (s->ctrl & SCSW_FCTL_CLEAR_FUNC) { /* TODO: Clear handling */ sch_handle_clear_func(sch); - ret = 0; } else if (s->ctrl & SCSW_FCTL_HALT_FUNC) { /* TODO: Halt handling */ sch_handle_halt_func(sch); - ret = 0; } else if (s->ctrl & SCSW_FCTL_START_FUNC) { ret = sch_handle_start_func_passthrough(sch); - } else { - /* Cannot happen. */ - return -ENODEV; } return ret; @@ -1278,11 +1270,11 @@ int do_subchannel_work_passthrough(SubchDev *sch) static int do_subchannel_work(SubchDev *sch) { - if (sch->do_subchannel_work) { - return sch->do_subchannel_work(sch); - } else { + if (!sch->do_subchannel_work) { return -EINVAL; } + g_assert(sch->curr_status.scsw.ctrl & SCSW_CTRL_MASK_FCTL); + return sch->do_subchannel_work(sch); } static void copy_pmcw_to_guest(PMCW *dest, const PMCW *src) -- 2.13.5