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=-6.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=no 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 DAB8DC433DF for ; Wed, 5 Aug 2020 09:37:39 +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 9B5D52075A for ; Wed, 5 Aug 2020 09:37:39 +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="U/JcH6+t" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B5D52075A 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]:44038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3Fre-0003EZ-R4 for qemu-devel@archiver.kernel.org; Wed, 05 Aug 2020 05:37:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3Fqo-0002bP-3x for qemu-devel@nongnu.org; Wed, 05 Aug 2020 05:36:46 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:38073 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3Fqk-00067P-QP for qemu-devel@nongnu.org; Wed, 05 Aug 2020 05:36:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596620201; 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=vKAn+v1rA6cnV26g8CFNt4AyirUyrreCoudVAKB0Lu8=; b=U/JcH6+t1iiH3ISKUn19wgabzrTV+m3HCt7EhfD9KFsEY6NOpHon6WlzkRTS+pmXdyBpz/ MLrNBOcHk2vKFVxytNOHfzbbenbC+Uuf8xTiDV9cE3PZ7f1AbmJKv8ixT+Pk8dzHbV+dpH A/J30Ej6kTFHlmaAS2IcSP6olRGZsBE= 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-187-W9WX0DPlMpWomk6aynTyOw-1; Wed, 05 Aug 2020 05:36:39 -0400 X-MC-Unique: W9WX0DPlMpWomk6aynTyOw-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 E2EEA101C8A0; Wed, 5 Aug 2020 09:36:37 +0000 (UTC) Received: from gondolin (ovpn-113-4.ams2.redhat.com [10.36.113.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 398238AC14; Wed, 5 Aug 2020 09:36:36 +0000 (UTC) Date: Wed, 5 Aug 2020 11:36:33 +0200 From: Cornelia Huck To: Thomas Huth Subject: Re: [PATCH for-5.2 5/6] pc-bios/s390-ccw: Scan through all boot devices if none has been specified Message-ID: <20200805113633.2822d28d.cohuck@redhat.com> In-Reply-To: <20200728183734.7838-6-thuth@redhat.com> References: <20200728183734.7838-1-thuth@redhat.com> <20200728183734.7838-6-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=207.211.31.81; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/05 03:37:07 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, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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:33 +0200 Thomas Huth wrote: > If no boot device has been specified (via "bootindex=..."), the s390-ccw > bios scans through all devices to find a bootable device. But so far, it > stops at the very first block device (including virtio-scsi controllers > without attached devices) that it finds, no matter whether it is bootable > or not. That leads to some weird situatation where it is e.g. possible > to boot via: > > qemu-system-s390x -hda /path/to/disk.qcow2 > > but not if there is e.g. a virtio-scsi controller specified before: > > qemu-system-s390x -device virtio-scsi -hda /path/to/disk.qcow2 > > While using "bootindex=..." is clearly the preferred way of booting > on s390x, we still can make the life for the users at least a little > bit easier if we look at all available devices to find a bootable one. > > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1846975 > Signed-off-by: Thomas Huth > --- > pc-bios/s390-ccw/main.c | 46 +++++++++++++++++++++++++++-------------- > 1 file changed, 31 insertions(+), 15 deletions(-) (...) > int main(void) > { > sclp_setup(); > css_setup(); > boot_setup(); > - find_boot_device(); > - enable_subchannel(blk_schid); > - ipl_boot_device(); > + if (have_iplb) { > + find_boot_device(); > + enable_subchannel(blk_schid); > + ipl_boot_device(); > + } else { > + probe_boot_device(); > + } The one thing that's a bit surprising with the code is that enable_subchannel() sticking out now. The code looking for a boot device does that for all subchannels it looks at... but I think find_boot_device() did that for specified devices already as well, so it seems redundant? Anyway, that's something that can be looked at later. > > panic("Failed to load OS from hard disk\n"); > return 0; /* make compiler happy */ Reviewed-by: Cornelia Huck