From nobody Mon Nov 10 12:49:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556199007; cv=none; d=zoho.com; s=zohoarc; b=CXEPSL3Khq6joOEV24Nc5R2i7kkkZM02oJ7AMEnCQq7nvIWzaQrQMGW9/9QHLS4xrCP3a3/Fhgqg4aypkzweu/alc4oedVS7J8AzG3qefi4tjmubrfHBiFcybv30YhTG++G4VlCpWfa6s6NhWvrC+6EiGN/sLZA5Gu7bCl4EU/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556199007; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=nQHQX/6WpSe5Jv8gnSahCdIN9/tiOHSge+yS+udcviM=; b=XQQBQHSYuWvcV/tQz3miG9woALPydV547aPfJCTDt4yRSjYn9BGl9T2zHmxqCKpsU24hPLjF/3IIvVQxDddd0uyPQJcKqMxzsIanNJhfUlnfohoE6pjQAQK1+a2hrhy1rrz41PJLHcGrhx+/DRi/8fNM7b2EyM58R4uijPxnbxI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556199007263815.4669195576445; Thu, 25 Apr 2019 06:30:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:57170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeRw-0001JN-9v for importer@patchew.org; Thu, 25 Apr 2019 09:30:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJeKY-0003nj-PL for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:22:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJeKX-00045N-JG for qemu-devel@nongnu.org; Thu, 25 Apr 2019 09:22:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42446) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJeKV-0003xp-PO; Thu, 25 Apr 2019 09:22:25 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AFEE53008CDB; Thu, 25 Apr 2019 13:22:13 +0000 (UTC) Received: from localhost (dhcp-192-187.str.redhat.com [10.33.192.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 50CDF60BE5; Thu, 25 Apr 2019 13:22:13 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Thu, 25 Apr 2019 15:21:31 +0200 Message-Id: <20190425132134.2839-17-cohuck@redhat.com> In-Reply-To: <20190425132134.2839-1-cohuck@redhat.com> References: <20190425132134.2839-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 25 Apr 2019 13:22:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 16/19] s390-bios: Use control unit type to find bootable devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Jason J. Herne" , qemu-s390x@nongnu.org, qemu-devel@nongnu.org, Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Jason J. Herne" When the user does not specify which device to boot from then we end up guessing. Instead of simply grabbing the first available device let's be a little bit smarter and only choose devices that might be bootable like disk, and not console devices. Signed-off-by: Jason J. Herne Message-Id: <1554388475-18329-17-git-send-email-jjherne@linux.ibm.com> [thuth: Added fix for virtio_is_supported() not being called anymore] Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/main.c | 45 ++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 3c449ad49688..a69c73349e8f 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -21,6 +21,7 @@ static char loadparm_str[LOADPARM_LEN + 1] =3D { 0, 0, 0,= 0, 0, 0, 0, 0, 0 }; QemuIplParameters qipl; IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); static bool have_iplb; +static uint16_t cutype; LowCore const *lowcore; /* Yes, this *is* a pointer to address 0 */ =20 #define LOADPARM_PROMPT "PROMPT " @@ -58,11 +59,15 @@ unsigned int get_loadparm_index(void) * subchannel information block (schib) with the connected subchannel's in= fo. * NOTE: The global variable blk_schid is updated to contain the subchannel * information. + * + * If the caller gives dev_no=3D-1 then the user did not specify a boot de= vice. + * In this case we'll just use the first potentially bootable device we fi= nd. */ static bool find_subch(int dev_no) { Schib schib; int i, r; + bool is_virtio; =20 for (i =3D 0; i < 0x10000; i++) { blk_schid.sch_no =3D i; @@ -74,16 +79,39 @@ static bool find_subch(int dev_no) continue; } =20 - /* Skip net devices since no IPLB is created and therefore no - * network bootloader has been loaded - */ enable_subchannel(blk_schid); - if (virtio_is_supported(blk_schid) && - virtio_get_device_type() =3D=3D VIRTIO_ID_NET && dev_no < 0) { - continue; + cutype =3D 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 =3D virtio_is_supported(blk_schid); + + /* No specific devno given, just return 1st possibly bootable devi= ce */ + if (dev_no < 0) { + switch (cutype) { + case CU_TYPE_VIRTIO: + if (is_virtio) { + /* + * Skip net devices since no IPLB is created and there= fore + * no network bootloader has been loaded + */ + if (virtio_get_device_type() !=3D VIRTIO_ID_NET) { + return true; + } + } + continue; + case CU_TYPE_DASD_3990: + case CU_TYPE_DASD_2107: + return true; + default: + continue; + } } =20 - if ((dev_no < 0) || (schib.pmcw.dev =3D=3D dev_no)) { + /* Caller asked for a specific devno */ + if (schib.pmcw.dev =3D=3D dev_no) { return true; } } @@ -200,15 +228,12 @@ static void virtio_setup(void) =20 int main(void) { - uint16_t cutype; - sclp_setup(); css_setup(); boot_setup(); find_boot_device(); enable_subchannel(blk_schid); =20 - cutype =3D cu_type(blk_schid); switch (cutype) { case CU_TYPE_DASD_3990: case CU_TYPE_DASD_2107: --=20 2.17.2