From patchwork Mon Feb 10 20:41: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: 863843 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1792564wrt; Mon, 10 Feb 2025 12:47:13 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUy0qA5HQsPRA0+0rzC0wsYgn+wf6pjR1cP/qtzDTKG1u+sXu6MqXhtEBG3Vq4McvJXFmP55g==@linaro.org X-Google-Smtp-Source: AGHT+IHAGeo+q9nr8ClQEBAPBJYdlTl/VnN4m/hHm5PJGs8kIjow2+KgtSsg7oR0aRVS1j3semAq X-Received: by 2002:ad4:5f89:0:b0:6e4:3cf1:5621 with SMTP id 6a1803df08f44-6e4455e883emr222307836d6.12.1739220432938; Mon, 10 Feb 2025 12:47:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739220432; cv=none; d=google.com; s=arc-20240605; b=JgVZkOKEk62e9zrGF/FdlCaW3t4NYv9pJx0BlpkQmKkXaM9ZzNxPC5+CPDKDY+ZFJ3 jiMk5CqlS4rB6bu1fvn6M6lMViCAEhrZzGciHl+KP7PZ2Q5jyAQemNxP6gaf7coXBZmJ r8PPxR9jnBRrEqYeBP8tiwqUPFGTRAO2wS+RrYJPp9O976YGWp+hiMt4rSjB5a8n/AFU eKVEmThCG5f6D3qsLq3SnkdEDp7xyZiXMb8N1aAJ3Qlo/1xQ65tvjRyyUPxq9YF0gLeX IAtV1474Y8A0QQua8axjmzondjnAuHN/fDAQ2qhzJ+qU5XPbVidkl7BPQLt7+DCDCUJa Lqyw== 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=nwm1ZkyQbCKYEL7sQcfI0amiIz6D6N+OhtZTgkExnsw=; fh=7gZvlf5c4KqY17UefY3VLfTm+bVDxskXHVg/jnbpAaM=; b=hJh/ko7aI3XMi6nS//v746dh2FyA2a2+FpLgtkMapU8YAFz2bSZ3QsLWSBA7qVKYcP /aZqX39V0xqGkPSr2aWHbs2G6s8Na9OTg8QrmqhkxixwHiwxwMHNkMlMmLTaVccNPjCn E9rLPlXdA/wRhu4gdECuEeGJKHelaTTXdja6cVRnbsaaoJ7JRngo+UQxLLuBsxw0DBNO cCDCdyL3a5yZ/srmvFXJUoBdJKgw5k665MWNHKHWJQ/vqUR18BBIEuVpcu7+9F6rDwyB QfMZSNDXwo2iOp5qdXKQHKKu0OyUvHQeofKvDDp0PYCDaY9RDQ3wZyupPZp06aqz1kJO m8HQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="WHuRt/xZ"; 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 6a1803df08f44-6e44b0ed93fsi74862316d6.120.2025.02.10.12.47.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 12:47:12 -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="WHuRt/xZ"; 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 1thadj-0003Vf-Q0; Mon, 10 Feb 2025 15:44:24 -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 1thadf-00035D-B1 for qemu-devel@nongnu.org; Mon, 10 Feb 2025 15:44:19 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thadd-0003sf-Br for qemu-devel@nongnu.org; Mon, 10 Feb 2025 15:44:19 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43934d6b155so13690655e9.1 for ; Mon, 10 Feb 2025 12:44:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739220255; x=1739825055; 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=nwm1ZkyQbCKYEL7sQcfI0amiIz6D6N+OhtZTgkExnsw=; b=WHuRt/xZ+SKNK3MJigOap6ZgXNx6Jbyh+fzhFmb5zMUsW0o7YYYAHMC32ar1ykvARd QxMntnCnZbsgvKirtkfKR5XZphi4GhUKZOiB/A8eRlIh0LhwBBRzzU8mGeEhBcFZ3Kn+ DpMWPft8N8poAkFgtkszqkKtqWBjXKF00oumNs5pR+hzWiHuuWpgMAd8YaYBykFscVAf 6XyREEgTnWGMzELjHLaTFydlCvpRz8zGiIw7w37KdlRHY5ujam5M/DtEptfYWCGyuoHW UrI5BnC/mi4NWb3+qw2+32Miv6hzBX/YJNQS65FjkQERjLckGziP6KAiiVsIdeUCvTm0 3oSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739220255; x=1739825055; 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=nwm1ZkyQbCKYEL7sQcfI0amiIz6D6N+OhtZTgkExnsw=; b=tWQPUPxswvgHmyaNSFfZ/1ayoZ0/z6IV6kKP01RcMFxRBaotXuMP1qWnZkBCCMozt2 vqBIkT6DSisnBqMqQ0+JFOr0DcSqsPob5xx09i8jqwGs3UyTLzYbaKGLcSTtxrAAzlxL mh23d08qSb2wrQc6bBkc0V5XEkSAnjj1OM6A758twSbbabQsODLPZnQ9pbGo9mwqZDlr IFZc7wemR37LVgLXKeIejE4YMZqK3KsgrGhy9YavtY/z+yqNMB/Y7dAdKhlGGUfL5eFE RuT5GMDVH/cr/IMykKr8bNqpEGM2//hq41TSDQM4T8aRmNilOOKbKdefkr4+Z8XbcMdU Qw9w== X-Gm-Message-State: AOJu0YwNCwoJxU79zssQqOSqAXGD45eLEkkc76tRM/UMA+TyBFPkBRVE hpIFJuDj9UFuf6C9aIaIOPBbboZWPjSKBG2tNtliaSsL1HcUYNb/6UimvXs4nsL4obk3eAvPGK7 AcVw= X-Gm-Gg: ASbGncvzSDfnUVKGMcsFSpHt00DTWWPFisw/6eBEjE2XGUbSLA1Ci0EI7MqsWLT+yzs Lj5h2EHtlUOPnoEh24iz93LULfrnV46iLUwAEXpeLmfEYy/j5Sh592vZMlyzyRsL3IgRd84yz2S KqFP7eVqmQkZuSkm+WcPikPuiRhtvS2VKsRCt8JzpNj7NIuyfTzgwFbJb+16RAdBcrFt6jwPIvK s/w5hVKFJF6nkUVYAsaCS4taNNtMYyZSxcoIo/6nEUdFleziLAhlAmVLH+Pfgt3WoNnqQaIeJ4N /TgYOlNTzFL4zqzvWmeGefNL80DIfxensiHqtcfvTvtoMPFMxhYvu5AAc7pCGFnVdw== X-Received: by 2002:a05:600c:1c85:b0:434:ea1a:e30c with SMTP id 5b1f17b1804b1-4394cf08108mr6697495e9.13.1739220255360; Mon, 10 Feb 2025 12:44:15 -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-4394127afcbsm53217585e9.23.2025.02.10.12.44.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Feb 2025 12:44:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 25/32] hw/riscv: Remove all invalid uses of auto_create_sdcard=true Date: Mon, 10 Feb 2025 21:41:57 +0100 Message-ID: <20250210204204.54407-26-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250210204204.54407-1-philmd@linaro.org> References: <20250210204204.54407-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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::auto_create_sdcard is only useful to automatically create a SD card, attach a IF_SD block drive to it and plug the card onto a SD bus. None of the RISCV machines modified by this commit try to use the IF_SD interface. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20250204200934.65279-7-philmd@linaro.org> --- hw/riscv/opentitan.c | 1 - hw/riscv/shakti_c.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/spike.c | 1 - hw/riscv/virt.c | 1 - 5 files changed, 5 deletions(-) diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c index d78a96c5354..b9e56235d87 100644 --- a/hw/riscv/opentitan.c +++ b/hw/riscv/opentitan.c @@ -121,7 +121,6 @@ static void opentitan_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type = TYPE_RISCV_CPU_IBEX; mc->default_ram_id = "riscv.lowrisc.ibex.ram"; mc->default_ram_size = ibex_memmap[IBEX_DEV_RAM].size; - mc->auto_create_sdcard = true; } static void lowrisc_ibex_soc_init(Object *obj) diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c index efe814b5868..e2242b97d0c 100644 --- a/hw/riscv/shakti_c.c +++ b/hw/riscv/shakti_c.c @@ -84,7 +84,6 @@ static void shakti_c_machine_class_init(ObjectClass *klass, void *data) mc->default_cpu_type = TYPE_RISCV_CPU_SHAKTI_C; mc->valid_cpu_types = valid_cpu_types; mc->default_ram_id = "riscv.shakti.c.ram"; - mc->auto_create_sdcard = true; } static const TypeInfo shakti_c_machine_type_info = { diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 164eb3ab83b..73d3b74281c 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -153,7 +153,6 @@ static void sifive_e_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type = SIFIVE_E_CPU; mc->default_ram_id = "riscv.sifive.e.ram"; mc->default_ram_size = sifive_e_memmap[SIFIVE_E_DEV_DTIM].size; - mc->auto_create_sdcard = true; object_class_property_add_bool(oc, "revb", sifive_e_machine_get_revb, sifive_e_machine_set_revb); diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 1ea35937e15..74a20016f14 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -358,7 +358,6 @@ static void spike_machine_class_init(ObjectClass *oc, void *data) /* platform instead of architectural choice */ mc->cpu_cluster_has_numa_boundary = true; mc->default_ram_id = "riscv.spike.ram"; - mc->auto_create_sdcard = true; object_class_property_add_str(oc, "signature", NULL, spike_set_signature); object_class_property_set_description(oc, "signature", "File to write ACT test signature"); diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 2aa420f6e55..241389d72f8 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1918,7 +1918,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type = TYPE_RISCV_CPU_BASE; mc->block_default_type = IF_VIRTIO; mc->no_cdrom = 1; - mc->auto_create_sdcard = true; mc->pci_allow_0_address = true; mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props;