From patchwork Tue Feb 4 18:28:57 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: 861834 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:11cb:b0:385:e875:8a9e with SMTP id i11csp448733wrx; Tue, 4 Feb 2025 10:30:45 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXDegpkjgvj7ySkfXO/Cf3uYHqVWZmp9X9ZmcHB3Kudczyjy5Eq5F0oPA7XAFVK5FIXQ3OdgA==@linaro.org X-Google-Smtp-Source: AGHT+IF2SbLq0zKZXZeV10t6FmZlwc8QyS9RaKuEV18tdeLTkgrhgTu0shhstxE0fUr3eDzGxfmC X-Received: by 2002:a05:6102:334d:b0:4b1:1b24:7241 with SMTP id ada2fe7eead31-4ba479470b7mr90369137.15.1738693845700; Tue, 04 Feb 2025 10:30:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738693845; cv=none; d=google.com; s=arc-20240605; b=X5rQytYs7rsEOI2PnqCYUF2R8eRr4PflA/K9w9qKe8Ni3j5cXD8g1QbSouw4i21BBK ZCiLWufHn7ofTDnBlT7Rsp4PvZdswDX+9se6OhmT2sySiHq017ccar0Y41B8iTVHdr5h yUZcod+Tzw+PBT0Jrq7nCspHDrFhDXQ5RDAMp/Fx1lpSytXTu21xQo2V2q/gai1l+uk2 vZdvoBu52tA0SdJIj7Lsj+lKvuphehKCC54WgVr3ELH9VkcbZVN5dmCW26kKoSvLU29I tzkZlg8l3IESiMjMVEDfOypCmSoS6JRfQiAYJnqZsyUzyhllGHDzG4oSfB+WMrQEnVpi gdGA== 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=6Ac7rd1sqNQYQ3AOFuZ9LS+akvNNGJF/e3vLwfEFzzU=; b=cjARi+t77Vhlk2kMr1g+x6fcPZKTvZcdXubJEQWRxeATwhtyL+x0S06aKkKZDftv2r yFkter05EzKQT7QiutloyRhtPebt6zkVceGDtsPSfuh8SIgka6TitTiBlXoBEgIODhjR gKSDRoo6y31NaehlfmeBkC26NvmufSZzxhLYdnJMb7GK5slynEk9IV7Lgh6FT9POWGeT qHbBXILfP9fK7OqGFZskuzOV3tvB9uwUi1oIoC0ICRhoLEJfxNgx+mcwSN1fVwBh20+/ NePoiSSrYbc2iHi5uMhK/J8FN5raeqcqp/jH+/5sHTYHVDzgcBX4qXoI2mM79bBIVF1P RB8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qc1pJ6w5; 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 ada2fe7eead31-4b9baa63167si2663625137.27.2025.02.04.10.30.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Feb 2025 10:30:45 -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=Qc1pJ6w5; 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 1tfNfn-0000NZ-Fu; Tue, 04 Feb 2025 13:29:23 -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 1tfNfh-0000Kb-9k for qemu-devel@nongnu.org; Tue, 04 Feb 2025 13:29:18 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tfNfc-0004p5-I6 for qemu-devel@nongnu.org; Tue, 04 Feb 2025 13:29:15 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4361c705434so44358355e9.3 for ; Tue, 04 Feb 2025 10:29:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738693750; x=1739298550; 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=Qc1pJ6w5ZvdK0FenAiwexlnLFHGHBn9FYZ+VjSUrTjq8JJHF0MHHQelzGcT+vekAtQ m8KXpDMNdrfZOAEA5FsQamJ/MS0qXvvbEUo04X1MkVeJuDpQWx3KwzDpQcmVO4CmfCId leGeSCvZzSNvUtbGEKLeYNL+gkCnW9m7l9A0ANQEzj5ECU4tk/NcaM0DyVHudv4hqdKX Ctd6lUrlng6dyzZTqDKIptXahNa/p5CYhJGAjfAktmfcT8eYjj+kcnCEkD/nAFNOqxaU a/+bhXigtKoHxf3z0hRc+Nhki7ky04rMxoxbbZ0oHYRRRM4FsZxxsfaTdIdHYUsjgBBM hu3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738693750; x=1739298550; 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=ExAON1GpiusKrRstdgEQ8y98Tuw494FXVLyv7YrO2WN8ExhlVrJS+0ZOIYQTE+Batj 67NkH9YtDF5LhlWvvAFeULWJ4kig5+Kq+sLc1qRTd28EOneyP0AjRRrGSZ7+3dTIzcDx wpQEUOCo/4y2zZKnc4/ul7SNnoE+vDxVpum4LVtpgYNjCMR3ORiAN68EXKN/Crq3u09Y 3ROSNLykQgdWQEKkB1UMLDF2LElWx2Hx2+bXLUctClg2Z7HCcvTEQ9Q/cVmFzvYtyzQc qfvdcQgS1TwSnAwPye2UopWEN7V8Z8H9Jw3dRGWja/lU9a8MWG8AHDEmAxWwagITjp0O 6Sww== X-Gm-Message-State: AOJu0Yw8UqjVMmKMwhgUMkQBEb6V6iHQN9MpHQ053MDKs+v6apQqz0J+ sQLvsU+AdgNk0krXiVuf+m6u1E+M0VO+/mnNBZ051EdBh11+NImtNVeVRckBK0Oog+b4LFRcvuS is+c= X-Gm-Gg: ASbGncsMkNVLOlcolDajDvzEk7UG/Ld5CGJEVfKmojzzB8/0sxlOLQh5Gu8WMY/RcY5 njSatIObCtratHkJNh2eR3IePc/Gsq17XzV22NFZnYQRUtS9CYeTH5KjRDYTvdqgVsVWFoQiV4B Mv4vJLwdhV96Eqnhe135Vldro03PMT1GZFzvwqllVS6fiflcrUNn7Z6wRah3hvbvuWBE2LlsyX3 dD1V9iTVxcKR8GCM+XECHPP1UI4S10bD3OSIXZVeKzsx/gQP1bQMbJmjcvIeVK2kN6C5MdJRGov j/zfPJ/AoqNQ54mCc4yzhY0YniYdSvhiUAh8KBGebfJzdGOewbdyY/7od3nbacp1kA== X-Received: by 2002:a05:600c:3b94:b0:434:a929:42bb with SMTP id 5b1f17b1804b1-438dc3cbb71mr246227075e9.18.1738693750148; Tue, 04 Feb 2025 10:29:10 -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-438e244ed3fsm203163145e9.31.2025.02.04.10.29.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Feb 2025 10:29:09 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Thomas Huth , Paolo Bonzini , Peter Maydell , Markus Armbruster , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/7] hw/boards: Convert no_sdcard flag to OnOffAuto tri-state Date: Tue, 4 Feb 2025 19:28:57 +0100 Message-ID: <20250204182903.59200-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250204182903.59200-1-philmd@linaro.org> References: <20250204182903.59200-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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=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: , 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) {