From nobody Fri Dec 19 06:29:43 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657181347; cv=none; d=zohomail.com; s=zohoarc; b=VotOCUbskHj4rQ/sFzrj6zi8O1gwy0eG/gkEBdC0B8gGWiIeTkQ5BmU874EOOk+/XDG+u3IM4/22HQhPS0TSt+r7Rr1hPaqDfkZx9V1F7WU5P288x8TDEjap1Z1makJzVDzKLCxivGyvH0QJO6gd1+Mn/yi68/7ENgO+VCpAhGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657181347; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J9J9998Hzsjj1L77yG8zj6+188E2SlID9WdEaxOYgPs=; b=CTYWHVIxLmLb3n1zyot9eQ1oIGIuvvRNtLPqnVZOAX3m7eRKF4zLQZ1AlE4ucrxWe2VLCg38D0K6xkqXVnixRE22uvJLc6TFGmu4V+OsTnUMMGgxktuQUufuZxZJ+t0QBZqo73BDAT9XIyvncZCGDKFpjbTzf7XS7D5fkvkvpEw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657181347942980.8432109033123; Thu, 7 Jul 2022 01:09:07 -0700 (PDT) Received: from localhost ([::1]:38432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9MZN-0000QZ-8J for importer@patchew.org; Thu, 07 Jul 2022 04:09:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9MLa-0002kE-3T for qemu-devel@nongnu.org; Thu, 07 Jul 2022 03:54:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9MLY-0007W6-Le for qemu-devel@nongnu.org; Thu, 07 Jul 2022 03:54:49 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-141-_2VeXVwxMMmlexLRqx30SQ-1; Thu, 07 Jul 2022 03:54:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6BAB9185A7BA; Thu, 7 Jul 2022 07:54:44 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5752E40CF8E5; Thu, 7 Jul 2022 07:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657180488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J9J9998Hzsjj1L77yG8zj6+188E2SlID9WdEaxOYgPs=; b=gO1ExBtCetIofU+uTeXnVQb4BSxyc+W3R4Nm6di9m/GN2dn4/08ApRt3/JSlaeRUpR+jf5 go8aEsiL5BQhjOXcXNWJkx2GQmOUddnGHrEmmeBJ1YDZo/6N3lCJUS6faroJnCyy65foLO 3XBTVxXmYqrLNpIp28gE1n0vawN1l9I= X-MC-Unique: _2VeXVwxMMmlexLRqx30SQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Cornelia Huck , Eric Farman Subject: [PULL 09/18] pc-bios/s390-ccw/virtio: Beautify the code for reading virtqueue configuration Date: Thu, 7 Jul 2022 09:54:17 +0200 Message-Id: <20220707075426.1163210-10-thuth@redhat.com> In-Reply-To: <20220707075426.1163210-1-thuth@redhat.com> References: <20220707075426.1163210-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657181349844100001 Content-Type: text/plain; charset="utf-8" It looks nicer if we separate the run_ccw() from the IPL_assert() statement, and the error message should talk about "virtio device" instead of "block device", since this code is nowadays used for non-block (i.e. network) devices, too. Message-Id: <20220704111903.62400-9-thuth@redhat.com> Reviewed-by: Cornelia Huck Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/virtio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index d8c2b52710..f37510f312 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -289,9 +289,8 @@ void virtio_setup_ccw(VDev *vdev) .num =3D 0, }; =20 - IPL_assert( - run_ccw(vdev, CCW_CMD_READ_VQ_CONF, &config, sizeof(config), f= alse) =3D=3D 0, - "Could not get block device VQ configuration"); + rc =3D run_ccw(vdev, CCW_CMD_READ_VQ_CONF, &config, sizeof(config)= , false); + IPL_assert(rc =3D=3D 0, "Could not get virtio device VQ configurat= ion"); info.num =3D config.num; vring_init(&vdev->vrings[i], &info); vdev->vrings[i].schid =3D vdev->schid; --=20 2.31.1