From patchwork Tue Feb 4 18:07:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 861825 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:11cb:b0:385:e875:8a9e with SMTP id i11csp439583wrx; Tue, 4 Feb 2025 10:10:13 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV4PC/zzJuC0CM82pSzc8J8/IXrbtpcLcEVf1USZAZtBNsoouJdrfJIUd7xbROZJqysws9vNA==@linaro.org X-Google-Smtp-Source: AGHT+IG0+zhnTvnMKj1SFziRqedcZGTuWR4KDPFcD2sXOwULyVe8wa63Ut/i+nbUIlxpZLGysDI4 X-Received: by 2002:a05:620a:4506:b0:7b6:7257:1359 with SMTP id af79cd13be357-7bffcce86c5mr4087771385a.13.1738692613593; Tue, 04 Feb 2025 10:10:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738692613; cv=none; d=google.com; s=arc-20240605; b=ZLIZ/eaC6Qp+9hKyCluzxvFDIgoaDS4FNNv3xgkliEqVrgiIRbI8p08TMLVuUfc02x 31mIpQRm6NnUKcXTbBK+RqrnHdGcDqIAqATaNOGJLZsZWVcSRYTTLam5AWxUxJaWyZhm mm0mh0cdlg2EQp4Ozrh2DxWcmAQShDMURaexrk5zmk5b9mPAvALeKmZulCf2CQ3FPtGN NGEienpUFYoqjubEBhUMcU8Am5R9Pea2BOvKfdSkIAkI4rGNqwFfp3j7ECg4NIjvxjxQ j0iqW5q7z8cXKCKQrCJmfR5C12EW/ZrdrJHMa7UycpUg0liGzDo+eB3okxry4myRzBxe Wd2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=BrfjnJSg9CX0l2LnyeLtW/bJrqIZsHOwQ9P6gpzmndY=; fh=Fr7KWdSB8csBog1HqFACDLHw5Bqh7nNqSJhjdxBBjk4=; b=h7H4+THeW8X/VC15Z+ZxPKLvcwEuLSeqmkQ4i0LjWeBBZ+D41QidTBeLdjk9i6CZ3h DYCkeT1eG6xxiz9E4I7Y7A2rPvK3f5gjlvj/ko1qX6yAcote/YaePctwrUT3CJx1AUZ+ 2LCatOlh7hXBbmoTlTyHKFW8DR/29lO7QQa79CA0muNRCVPw41D9NFinSw8kpjYE9dCw Z0OU6uhavZpNLUXpk+5nv8OjNHV7IC5jaY05qoPC7dLTzuMIoCC64pqJ1CQHZ+d88e1+ f1eQy3G1meqLHGVxIdASoHOFzAn8SYt+833wVIG9EYmUw9K+AZJI+jzd1Mk7udi6hyU6 +SeQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P2uA0u+8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c02db4bc1bsi348435685a.129.2025.02.04.10.10.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Feb 2025 10:10:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P2uA0u+8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tfNLC-0004M5-6R; Tue, 04 Feb 2025 13:08:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tfNL4-0004J4-IB for qemu-devel@nongnu.org; Tue, 04 Feb 2025 13:07:59 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tfNL1-00078m-CQ for qemu-devel@nongnu.org; Tue, 04 Feb 2025 13:07:57 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4363ae65100so70141105e9.0 for ; Tue, 04 Feb 2025 10:07:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738692473; x=1739297273; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BrfjnJSg9CX0l2LnyeLtW/bJrqIZsHOwQ9P6gpzmndY=; b=P2uA0u+8gWRX/oPFEDrpcFV80nG1++BjwvtUFTEq14oz4bG4BUlSld580WrxXNWAFB CMHoN/nMiyV0zxVkutCGL6Jpp+AVwJSMiiFdkPC3otwdrhaenyHznlRL/h4JboIu2TnY oIOiIvVUmQtRZuMhEw81ez151ngqokHDXhchS/dksjngAgnITTckVnbVYqvdNer+Hmps KnXl3qOSPlrNv0omX2s6jMHSr+R8ChJPdBFEES5LPewasySpHzGswGghPevlg27ULOXe yGiuNMHXyWA4IzqlkrYDWLhGYLP5lcjWFWvtGW/BROymx/Q7td7Srm2E3B0fdtfCc7jf 9oqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738692473; x=1739297273; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BrfjnJSg9CX0l2LnyeLtW/bJrqIZsHOwQ9P6gpzmndY=; b=lTffHsM+W2av20JhYQdLA0ziLv1akWrRe4XSXFwpXq0iquMHOWy6U8YD64Aw91yC4w IrV5qA9JwgGCurKtcVeqakhdEc/lNnzGUTBJPc2tVCn9PSLH3BHY/+gJLFDx/zFaQGg8 JLNRuMon6ZskX70peie+u9ykEumU0NbVklJjNuqeVmPRTmpMJ4tbRw44oJJ2ZUK+uvQ/ +q1mYAfOvfjrFPNMwWGwpzXiELMQ+ekaPxsD30Nc7vrA7Kyp5vi3xfzUKJJgBjZQiaoV NhHhU0ClsoTPSsviSLa+57+AZ/rDzVwUn3la0X35pewkpDa9+ngpsAS/Bo0gWY+N+s68 E6Bg== X-Gm-Message-State: AOJu0YyRwriNxzVgCIl0dTmqkY4ee6EsbH0hAVxBRIgZT1jcepatfZWZ xPlCbbOyBXKAYUdnrhT+J8bQq4NCgKDwtpe4JlN2UEO3zk3tigRSuD/PxCtWQsYQ987UbPgWdjv 3cFk= X-Gm-Gg: ASbGnct6ZmxmgkQRGcRKCVgo1Xk1lfN8y7rj+V5OVYSndQu4yswv7JeMSIPFQIafwLr kPcrmb+FHUmelhoOuufDusWBRQmVwwsh8wcC5D3TA/J2mGNC774glV8SicSjlwx3obl3LUj40uQ bpcNmlPj5UcTOrRDtt9ml2vDCkoWG+B92d+2fMBw6rhAoNxUZawai0Dypo/+iOI8TZJYRQyvwHn kI72QglbHu/WA9CQ2PbLuwGvEKuiw6mR/eIzwJhftmCmQMMk+TR7v3fDuZgkGcm2Vy1YcttGQAs i5aOlyNO/O65eWo90xMCELzUUW3RFwLnx8/inrDn35SiHGwJpfgg3TxAsvt8Vl0goA== X-Received: by 2002:a05:6000:1faa:b0:385:fb8d:865b with SMTP id ffacd0b85a97d-38c520a344emr28306088f8f.48.1738692473369; Tue, 04 Feb 2025 10:07:53 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc80e61sm236364185e9.34.2025.02.04.10.07.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Feb 2025 10:07:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Peter Maydell , qemu-ppc@nongnu.org, =?utf-8?q?Da?= =?utf-8?q?niel_P_=2E_Berrang=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-s390x@nongnu.org, Markus Armbruster , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/8] hw/boards: Convert no_sdcard flag to OnOffAuto tri-state Date: Tue, 4 Feb 2025 19:07:39 +0100 Message-ID: <20250204180746.58357-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250204180746.58357-1-philmd@linaro.org> References: <20250204180746.58357-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com 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=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org MachineClass::no_sdcard is initialized as false by default. To catch all uses, convert it to a tri-state, having the current default (false) becoming AUTO. No logical change intended. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- include/hw/boards.h | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/core/null-machine.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- system/vl.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index e1f41b2a533..d61b0a47780 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -283,9 +283,9 @@ struct MachineClass { no_parallel:1, no_floppy:1, no_cdrom:1, - no_sdcard:1, pci_allow_0_address:1, legacy_fw_cfg_order:1; + OnOffAuto no_sdcard; bool is_default; const char *default_machine_opts; const char *default_boot_order; diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 8477b828745..12418094f9d 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -463,7 +463,7 @@ static void zynq_machine_class_init(ObjectClass *oc, void *data) mc->desc = "Xilinx Zynq Platform Baseboard for Cortex-A9"; mc->init = zynq_init; mc->max_cpus = ZYNQ_MAX_CPUS; - mc->no_sdcard = 1; + mc->no_sdcard = ON_OFF_AUTO_ON; mc->ignore_memory_transaction_failures = true; mc->valid_cpu_types = valid_cpu_types; mc->default_ram_id = "zynq.ext_ram"; diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index f586a4bef54..b93056c0f7b 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -53,7 +53,7 @@ static void machine_none_machine_init(MachineClass *mc) mc->no_parallel = 1; mc->no_floppy = 1; mc->no_cdrom = 1; - mc->no_sdcard = 1; + mc->no_sdcard = ON_OFF_AUTO_ON; } DEFINE_MACHINE("none", machine_none_machine_init) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index d9e683c5b49..5f78c8d20ff 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -817,7 +817,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->no_cdrom = 1; mc->no_floppy = 1; mc->no_parallel = 1; - mc->no_sdcard = 1; + mc->no_sdcard = ON_OFF_AUTO_ON; mc->max_cpus = S390_MAX_CPUS; mc->has_hotpluggable_cpus = true; mc->smp_props.books_supported = true; diff --git a/system/vl.c b/system/vl.c index db8e604ebab..2940c865b19 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1346,7 +1346,7 @@ static void qemu_disable_default_devices(void) if (!has_defaults || machine_class->no_cdrom) { default_cdrom = 0; } - if (!has_defaults || machine_class->no_sdcard) { + if (!has_defaults || machine_class->no_sdcard == ON_OFF_AUTO_ON) { default_sdcard = 0; } if (!has_defaults) {