From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FA9CC433DF for ; Wed, 29 Jul 2020 08:55:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B9152070B for ; Wed, 29 Jul 2020 08:55:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D5+3QlUj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B9152070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0hs6-00044B-IP for qemu-devel@archiver.kernel.org; Wed, 29 Jul 2020 04:55:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0hrB-0003JN-9D for qemu-devel@nongnu.org; Wed, 29 Jul 2020 04:54:37 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:49829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0hr9-0005JT-Jk for qemu-devel@nongnu.org; Wed, 29 Jul 2020 04:54:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596012874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fX5h+jseMgoD/qhuS54nVmkq5d+o5gmWYntDAN5M+9U=; b=D5+3QlUj34tV9bnUWHv06M+cm+/d/8h7JiTIz6kLM+S3K3Ppgsxtsg9z5Gd69PbIVD3rO/ 86XfFSz3aCI9kELV/k9Eb19saxKy8OoTjeSwzPmMCp9IzeMctBh89eGHcVPfuMsYi9v7L6 R1oQLPDpLT30mMq/FwdZtx5ODzvhKnE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-258-jF3Wiy3GNBeCIhLKhvtT4w-1; Wed, 29 Jul 2020 04:54:31 -0400 X-MC-Unique: jF3Wiy3GNBeCIhLKhvtT4w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A13A107ACCA; Wed, 29 Jul 2020 08:54:30 +0000 (UTC) Received: from gondolin (ovpn-113-17.ams2.redhat.com [10.36.113.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80BE679251; Wed, 29 Jul 2020 08:54:28 +0000 (UTC) Date: Wed, 29 Jul 2020 10:54:26 +0200 From: Cornelia Huck To: Thomas Huth Subject: Re: [PATCH for-5.2 3/6] pc-bios/s390-ccw: Move the inner logic of find_subch() to a separate function Message-ID: <20200729105426.6d8a5a61.cohuck@redhat.com> In-Reply-To: <20200728183734.7838-4-thuth@redhat.com> References: <20200728183734.7838-1-thuth@redhat.com> <20200728183734.7838-4-thuth@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.74; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-74.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 01:09:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Jason J . Herne" , Collin Walling , Janosch Frank , qemu-devel@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org, Claudio Imbrenda Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 28 Jul 2020 20:37:31 +0200 Thomas Huth wrote: > Move the code to a separate function to be able to re-use it from a > different spot later. > > Signed-off-by: Thomas Huth > --- > pc-bios/s390-ccw/main.c | 99 ++++++++++++++++++++++++----------------- > 1 file changed, 57 insertions(+), 42 deletions(-) > > diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c > index 9b64eb0c24..9477313188 100644 > --- a/pc-bios/s390-ccw/main.c > +++ b/pc-bios/s390-ccw/main.c > @@ -51,6 +51,60 @@ unsigned int get_loadparm_index(void) > return atoui(loadparm_str); > } > > +static int check_sch_no(int dev_no, int sch_no) check_subchannel()? You verify dev_no as well, if supplied. > +{ > + bool is_virtio; > + Schib schib; > + int r; > + > + blk_schid.sch_no = sch_no; > + r = stsch_err(blk_schid, &schib); > + if (r == 3 || r == -EIO) { > + return -EIO; -ENODEV? It means that you either have no devices, or an invalid subchannel set. > + } > + if (!schib.pmcw.dnv) { > + return false; > + } > + > + enable_subchannel(blk_schid); > + cutype = cu_type(blk_schid); > + > + /* > + * Note: we always have to run virtio_is_supported() here to make > + * sure that the vdev.senseid data gets pre-initialized correctly > + */ > + is_virtio = virtio_is_supported(blk_schid); > + > + /* No specific devno given, just return 1st possibly bootable device */ "just return whether the device is possibly bootable" ? > + if (dev_no < 0) { > + switch (cutype) { > + case CU_TYPE_VIRTIO: > + if (is_virtio) { > + /* > + * Skip net devices since no IPLB is created and therefore > + * no network bootloader has been loaded > + */ > + if (virtio_get_device_type() != VIRTIO_ID_NET) { > + return true; > + } > + } > + return false; > + case CU_TYPE_DASD_3990: > + case CU_TYPE_DASD_2107: > + return true; > + default: > + return false; > + } > + } > + > + /* Caller asked for a specific devno */ > + if (schib.pmcw.dev == dev_no) { > + return true; > + } > + > + return false; > +} > + > /* > * Find the subchannel connected to the given device (dev_no) and fill in the > * subchannel information block (schib) with the connected subchannel's info. (...) Otherwise, LGTM.