From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:ac2:5544:0:0:0:0:0 with SMTP id l4csp968474lfk; Wed, 17 Nov 2021 08:38:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJx86yG0NHcEsah/A1ljAG+DHQQ7zGtj/b/1kGvon5rafUdpgwg0TteiFHxbU0p0f57P4ngh X-Received: by 2002:ad4:5bc4:: with SMTP id t4mr56764175qvt.3.1637167131751; Wed, 17 Nov 2021 08:38:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637167131; cv=none; d=google.com; s=arc-20160816; b=Hl/WZLTl1+6+CbxrE/xWC9ZiiFsVdwvIpW1I3vLUUGPHyBu3G0RL7W2Yr0mtKwO0d9 Aw41/GwvDYlDtx45YPEA/X/l9IPoGZRRUrRtFvoLYLybM0SonHxF6fPrNzoE0jQkn7sw u5knp2QI/SOYrYmYhmFaT3ICw0TvlCHDt2SDrJYlt8RkKJVCn6A9G5fWwa4gY9Dk+CqO 3UQEShw3GdY2BVU3U9+X92ZVEmtMS3YE0TWpVwncLyJRETqQSh57KLR0DwrN0kGXLeaE cews5hbhLqGxNMnkfp+6Nd9G9GbQq2zj1IGOqPzLrMwxei6hNgNrurcY7AcodLqrFqSR rzQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=EgarIjhvXGK6SoTdao173npcs6FsLF5ihY/bFRR9IPE=; b=A6nG5ZYVQnojtezVLSkUiF+u8ZJqas0ckgkpgz6ErH2WQj8N/MIfBsBHTXqVxnYivx nS1B7iNE3sk/nmXIiZXAyMgcX+3O78F/tk+EnqD82BZC24HQZq5LsL8Uc5kHvki8UXHM G9IL9lfXB/NDdZmx4qH6zmoibA91KLq3mCBCAFkIBjiw3GX+U5g37okKnzQXJq5IkS74 QApR9xqdGRYSy+wmKjg0uqyVFCB2FtfdHDIvp9Ajq7usmiVsfWL77ANySE7VG69deMWI QFnVBEJcCIK2nYkzTG5kG3ukHUOGCutSFZ/xIjEtiXPFJ6MAVDfjHZ2ME0+LlKulIHYD YjpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Q5mAcLOn; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g15si458268qtg.77.2021.11.17.08.38.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Nov 2021 08:38:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Q5mAcLOn; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:42642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnNxT-0004fk-1f for alex.bennee@linaro.org; Wed, 17 Nov 2021 11:38:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnNtE-0003MW-1g for qemu-devel@nongnu.org; Wed, 17 Nov 2021 11:34:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:24071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnNt9-00088U-Rv for qemu-devel@nongnu.org; Wed, 17 Nov 2021 11:34:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637166861; 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=EgarIjhvXGK6SoTdao173npcs6FsLF5ihY/bFRR9IPE=; b=Q5mAcLOnNL1tYtnyu6KM2pM/srsyiPYAtOler4WCPcLE0SBWSBY4TQHKLLwvy75fqCHwd+ zq/725YBCTbLTJWbPY8w5l8NprC8vVxONYRATjaxXc4tHt7HeIs08/J35/p5eIxujw5o+p vblNLI87mDOMjoo1wielPBbx3nYytTA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-177-1SLvi43POV6U-hB9QFRVsg-1; Wed, 17 Nov 2021 11:34:20 -0500 X-MC-Unique: 1SLvi43POV6U-hB9QFRVsg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B63419251A4; Wed, 17 Nov 2021 16:34:19 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-7.ams2.redhat.com [10.36.112.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE74C5F4E0; Wed, 17 Nov 2021 16:34:18 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8CC9D11380CF; Wed, 17 Nov 2021 17:34:09 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 07/13] hw/arm/mcimx7d-sabre: Replace drive_get_next() by drive_get() Date: Wed, 17 Nov 2021 17:34:03 +0100 Message-Id: <20211117163409.3587705-8-armbru@redhat.com> In-Reply-To: <20211117163409.3587705-1-armbru@redhat.com> References: <20211117163409.3587705-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.701, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , Peter Maydell , qemu-arm@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: MXSzp8OIY7R3 drive_get_next() is basically a bad idea. It returns the "next" block backend of a certain interface type. "Next" means bus=0,unit=N, where subsequent calls count N up from zero, per interface type. This lets you define unit numbers implicitly by execution order. If the order changes, or new calls appear "in the middle", unit numbers change. ABI break. Hard to spot in review. Machine "mcimx7d-sabre" connects backends with drive_get_next() in a counting loop. Change it to use drive_get() directly. This makes the unit numbers explicit in the code. Cc: Peter Maydell Cc: Andrey Smirnov Cc: qemu-arm@nongnu.org Signed-off-by: Markus Armbruster --- hw/arm/mcimx7d-sabre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 935d4b0f1c..50a5ecde31 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -52,7 +52,7 @@ static void mcimx7d_sabre_init(MachineState *machine) DriveInfo *di; BlockBackend *blk; - di = drive_get_next(IF_SD); + di = drive_get(IF_SD, 0, i); blk = di ? blk_by_legacy_dinfo(di) : NULL; bus = qdev_get_child_bus(DEVICE(&s->usdhc[i]), "sd-bus"); carddev = qdev_new(TYPE_SD_CARD); -- 2.31.1