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 62159C433DF for ; Wed, 29 Jul 2020 08:48:16 +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 295D02076E for ; Wed, 29 Jul 2020 08:48:16 +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="OnaAYTTM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 295D02076E 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]:47808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0hl1-0006Az-EY for qemu-devel@archiver.kernel.org; Wed, 29 Jul 2020 04:48:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0hkO-0005k6-8x for qemu-devel@nongnu.org; Wed, 29 Jul 2020 04:47:36 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:39059) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k0hkM-0004UT-1J for qemu-devel@nongnu.org; Wed, 29 Jul 2020 04:47:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596012452; 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=XzfplvbEl6K/U3utFzz6JkKQlrEfbwm7WX0JTkk6rL4=; b=OnaAYTTM87nKHqQ1mFzCguYySqksyRT/ZTtNKHJpj85D0EjtuOHPgqIdKAUun/pKZyBigE Tya4Tj0RVia6mUApsxrecp6uBAVVtrfe7DGSshzsJ+8jl88QcOcZpIR+4//Kg1mRbSVtgk sCUoG1yjxWHLKfDvc5YP/4PF8t5k5xI= 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-198-thNXQC2CM2qkSgaTFqo5pQ-1; Wed, 29 Jul 2020 04:47:28 -0400 X-MC-Unique: thNXQC2CM2qkSgaTFqo5pQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C91F107ACCA; Wed, 29 Jul 2020 08:47:27 +0000 (UTC) Received: from gondolin (ovpn-113-17.ams2.redhat.com [10.36.113.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E2B26932E; Wed, 29 Jul 2020 08:47:24 +0000 (UTC) Date: Wed, 29 Jul 2020 10:47:21 +0200 From: Cornelia Huck To: Thomas Huth Subject: Re: [PATCH for-5.2 2/6] pc-bios/s390-ccw: Move ipl-related code from main() into a separate function Message-ID: <20200729104721.6f2b8162.cohuck@redhat.com> In-Reply-To: <20200728183734.7838-3-thuth@redhat.com> References: <20200728183734.7838-1-thuth@redhat.com> <20200728183734.7838-3-thuth@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 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:30 +0200 Thomas Huth wrote: > Let's move this part of the code into a separate function to be able > to use it from multiple spots later. > > Signed-off-by: Thomas Huth > --- > pc-bios/s390-ccw/main.c | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) > > diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c > index 146a50760b..9b64eb0c24 100644 > --- a/pc-bios/s390-ccw/main.c > +++ b/pc-bios/s390-ccw/main.c > @@ -223,14 +223,8 @@ static void virtio_setup(void) > } > } > > -int main(void) > +static void ipl_boot_device(void) > { > - sclp_setup(); > - css_setup(); > - boot_setup(); > - find_boot_device(); > - enable_subchannel(blk_schid); > - > switch (cutype) { > case CU_TYPE_DASD_3990: > case CU_TYPE_DASD_2107: > @@ -242,8 +236,18 @@ int main(void) > break; > default: > print_int("Attempting to boot from unexpected device type", cutype); > - panic(""); > + panic("\nBoot failed.\n"); Maybe "Boot failed: no supported device type"? > } > +} > + > +int main(void) > +{ > + sclp_setup(); > + css_setup(); > + boot_setup(); > + find_boot_device(); > + enable_subchannel(blk_schid); > + ipl_boot_device(); > > panic("Failed to load OS from hard disk\n"); > return 0; /* make compiler happy */ Anyway, Reviewed-by: Cornelia Huck