From nobody Thu Dec 18 19:32:29 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1594650494; cv=none; d=zohomail.com; s=zohoarc; b=RIJmYs7d5oSXQXU+QnNpq/cPggUyxOd69rl05x6ea+zKurGBQ1yXfw3rM/KID7i4NNTEzKMbBa8wZGCHp9Jo/CyQBlbFX7yVr8XePYLC0OPGNrQof2Mbqceo/q+wdSJ6QDD2iyi5I7EXDIMSCA/9YbEi7FUcuW94sK5JvrqEGbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594650494; h=Content-Type:Content-Transfer-Encoding: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=wkQrJoXM425PWoucOv5GqHn+31dKoPwmmNyiyLTRjMk=; b=cidQ2IdqNBoXzOlFn4iyHm32M8fvPW6ToYBmycgWA6CDtmV6jplmsw+8qwf0TT4lBB8QaH3U+iZtQ1U++YwfFxdDc5yPrl1j1xPccuFjMVXQ2Nq0tuONxqx8KwnPRaaqQLKFOLc88kJG3MPOykekZkyrSE8LF2nYfA3cpsab7ow= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594650494535747.5288550244126; Mon, 13 Jul 2020 07:28:14 -0700 (PDT) Received: from localhost ([::1]:36020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juzRF-0001L8-B0 for importer@patchew.org; Mon, 13 Jul 2020 10:28:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juzBD-0005kO-F2 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:39 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juzB9-0006hB-Ia for qemu-devel@nongnu.org; Mon, 13 Jul 2020 10:11:39 -0400 Received: by mail-wr1-x442.google.com with SMTP id z15so16715214wrl.8 for ; Mon, 13 Jul 2020 07:11:35 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c136sm24031297wmd.10.2020.07.13.07.11.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wkQrJoXM425PWoucOv5GqHn+31dKoPwmmNyiyLTRjMk=; b=ab1N51qT6aWxcN+Ljw+HD5GaAfNJhRblBK3SF8vj8rNlyrfQhw357v4NmjpBSlor23 sWs5dIzM+jNXa7ZVw0YRZXYNRw6eEQebi5AvnCLUUIwjX2vWQTsI/m9RUmS3MFd3uRIs mUvGKaBRBJObN4oHEGeEhRMP0ZEFrz9PwHTPbu9zoOvfwx1LhrOv2JWxwPwECCFNN9CD 1Y4d3Yk57cF9fgqBkJdos31VYIajBgwFZgGD/khdp9sq5gD73yWvi3T4R/sMVBtAWWFr +MfUYYnAcLWCLRcqQcz4tEBeTwfpkdN3ZpzPMyyjEuWs7tYmNa+xP2agDqFcvQ3gDP7D /cWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wkQrJoXM425PWoucOv5GqHn+31dKoPwmmNyiyLTRjMk=; b=ZY62jPsY467LE/qhT/fc4P4UmDs1tet1CKUM1/c9dF/hPuEhRLK0z894bZ0vbdq/vq V/JdIblUIXFjoNOHwU+y9TyykWksOLK3ON1JhXGLT26RNMmoZaD6DfJlPO9yonGn4STQ Pjy9/eGYGHl0YjazCF0Za0x8nDOMxOiS/KmDhUUGL0i44vMeD5HZ9s1I7qnRbJE0VR94 Bzm8Tc158+FOenMY9uUpVA12tdjfZV7LQ+XtkcLffQTzH+/uZioxKO84NJ7NdXwExoFS 25ldUB2yFxjCyl8fn9i6exSQxE/MkeYVrH93eLKXs9VPxCCRrWwzGbuA/5XYPwGlo4Js XXvw== X-Gm-Message-State: AOAM532WLhIxKdqx5nEF61aLMCm9tn8JPeoCLe2j+FRcXkNpHShErpWQ a37UwatahxzaldGz8BBE05PP3k7HjIdirg== X-Google-Smtp-Source: ABdhPJw+0VHI65LvFGwTJnJo/snoGigZRm07x44aEMZiYpinRl2HuQbrurWhVRwOdttDWVT2mE1XPg== X-Received: by 2002:adf:ff8d:: with SMTP id j13mr77733455wrr.11.1594649493921; Mon, 13 Jul 2020 07:11:33 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/25] hw/arm/aspeed: Do not create and attach empty SD cards by default Date: Mon, 13 Jul 2020 15:11:04 +0100 Message-Id: <20200713141104.5139-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200713141104.5139-1-peter.maydell@linaro.org> References: <20200713141104.5139-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::442; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 Since added in commit 2bea128c3d, each SDHCI is wired with a SD card, using empty card when no block drive provided. This is not the desired behavior. The SDHCI exposes a SD bus to plug cards on, if no card available, it is fine to have an unplugged bus. Avoid creating unnecessary SD card device when no block drive provided. Fixes: 2bea128c3d ("hw/sd/aspeed_sdhci: New device") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200705173402.15620-1-f4bug@amsat.org Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Peter Maydell --- hw/arm/aspeed.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 660dcb54144..6a3a345a6f6 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -246,11 +246,12 @@ static void sdhci_attach_drive(SDHCIState *sdhci, Dri= veInfo *dinfo) { DeviceState *card; =20 - card =3D qdev_new(TYPE_SD_CARD); - if (dinfo) { - qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(din= fo), - &error_fatal); + if (!dinfo) { + return; } + card =3D qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sdhci), "sd-bus"), &error_fatal); --=20 2.20.1