Re: [PATCH v2 6/8] hw/arm: Remove all invalid uses of auto_create_sdcard=true

[Thomas Huth]

On 04/02/2025 19.07, Philippe Mathieu-Daudé wrote:
> 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 ARM machines modified by this
> commit try to use the IF_SD interface.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
...
> diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c
> index 4d84d10d24c..0a4b6f29b1c 100644
> --- a/hw/arm/bananapi_m2u.c
> +++ b/hw/arm/bananapi_m2u.c
> @@ -141,7 +141,6 @@ static void bpim2u_machine_init(MachineClass *mc)
>       mc->valid_cpu_types = valid_cpu_types;
>       mc->default_ram_size = 1 * GiB;
>       mc->default_ram_id = "bpim2u.ram";
> -    mc->auto_create_sdcard = true;
>   }

The bananapi seems to use IF_SD ... could you please double-check whether 
this is the right change here?

> diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
> index 43dc89d902e..2410e2a28e8 100644
> --- a/hw/arm/exynos4_boards.c
> +++ b/hw/arm/exynos4_boards.c
> @@ -165,7 +165,6 @@ static void nuri_class_init(ObjectClass *oc, void *data)
>       mc->min_cpus = EXYNOS4210_NCPUS;
>       mc->default_cpus = EXYNOS4210_NCPUS;
>       mc->ignore_memory_transaction_failures = true;
> -    mc->auto_create_sdcard = true;
>   }
>   
>   static const TypeInfo nuri_type = {
> @@ -185,7 +184,6 @@ static void smdkc210_class_init(ObjectClass *oc, void *data)
>       mc->min_cpus = EXYNOS4210_NCPUS;
>       mc->default_cpus = EXYNOS4210_NCPUS;
>       mc->ignore_memory_transaction_failures = true;
> -    mc->auto_create_sdcard = true;
>   }
>   
>   static const TypeInfo smdkc210_type = {

I think this is likely wrong, too - they use IF_SD via exynos4210.c, don't they?

> diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
> index e95ea5e4e18..c9c2e5dd3b1 100644
> --- a/hw/arm/imx25_pdk.c
> +++ b/hw/arm/imx25_pdk.c
> @@ -147,7 +147,6 @@ static void imx25_pdk_machine_init(MachineClass *mc)
>       mc->init = imx25_pdk_init;
>       mc->ignore_memory_transaction_failures = true;
>       mc->default_ram_id = "imx25.ram";
> -    mc->auto_create_sdcard = true;
>   }

This machine seems to use IF_SD, too?

> diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c
> index 86982cb0772..690cb64ef36 100644
> --- a/hw/arm/mcimx6ul-evk.c
> +++ b/hw/arm/mcimx6ul-evk.c
> @@ -74,6 +74,5 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc)
>       mc->init = mcimx6ul_evk_init;
>       mc->max_cpus = FSL_IMX6UL_NUM_CPUS;
>       mc->default_ram_id = "mcimx6ul-evk.ram";
> -    mc->auto_create_sdcard = true;
>   }
>   DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init)

dito?

> diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c
> index 33119610113..ac1f57f0671 100644
> --- a/hw/arm/mcimx7d-sabre.c
> +++ b/hw/arm/mcimx7d-sabre.c
> @@ -74,6 +74,7 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc)
>       mc->init = mcimx7d_sabre_init;
>       mc->max_cpus = FSL_IMX7_NUM_CPUS;
>       mc->default_ram_id = "mcimx7d-sabre.ram";
> -    mc->auto_create_sdcard = true;
> +
>   }

dito?

> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index df520c91906..00412193a4a 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -1421,7 +1421,6 @@ static void lm3s811evb_class_init(ObjectClass *oc, void 
> *data)
>       mc->init = lm3s811evb_init;
>       mc->ignore_memory_transaction_failures = true;
>       mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
> -    mc->auto_create_sdcard = true;
>   }

dito?

> diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
> index 941616cd25b..bc4522989ec 100644
> --- a/hw/arm/versatilepb.c
> +++ b/hw/arm/versatilepb.c
> @@ -419,7 +419,6 @@ static void versatilepb_class_init(ObjectClass *oc, void 
> *data)
>       mc->ignore_memory_transaction_failures = true;
>       mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
>       mc->default_ram_id = "versatile.ram";
> -    mc->auto_create_sdcard = true;
>   
>       machine_add_audiodev_property(mc);
>   }
> @@ -440,7 +439,6 @@ static void versatileab_class_init(ObjectClass *oc, void 
> *data)
>       mc->ignore_memory_transaction_failures = true;
>       mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
>       mc->default_ram_id = "versatile.ram";
> -    mc->auto_create_sdcard = true;
>   
>       machine_add_audiodev_property(mc);
>   }

dito?

> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
> index 2d626a96b9b..3c6a4604cc9 100644
> --- a/hw/arm/xilinx_zynq.c
> +++ b/hw/arm/xilinx_zynq.c
> @@ -466,7 +466,6 @@ static void zynq_machine_class_init(ObjectClass *oc, void 
> *data)
>       mc->ignore_memory_transaction_failures = true;
>       mc->valid_cpu_types = valid_cpu_types;
>       mc->default_ram_id = "zynq.ext_ram";
> -    mc->auto_create_sdcard = true;
>       prop = object_class_property_add_str(oc, "boot-mode", NULL,
>                                            zynq_set_boot_mode);
>       object_class_property_set_description(oc, "boot-mode",

I'm confused about this one ... it used to have no_sdcard = 1 , but it still 
seems to use IF_SD ?

> diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
> index 0c6f0359e3d..1401d37959e 100644
> --- a/hw/arm/xlnx-versal-virt.c
> +++ b/hw/arm/xlnx-versal-virt.c
> @@ -818,7 +818,6 @@ static void versal_virt_machine_class_init(ObjectClass *oc, 
> void *data)
>       mc->max_cpus = XLNX_VERSAL_NR_ACPUS + XLNX_VERSAL_NR_RCPUS;
>       mc->default_cpus = XLNX_VERSAL_NR_ACPUS + XLNX_VERSAL_NR_RCPUS;
>       mc->no_cdrom = true;
> -    mc->auto_create_sdcard = true;
>       mc->default_ram_id = "ddr";
>       object_class_property_add_str(oc, "ospi-flash", versal_get_ospi_model,
>                                      versal_set_ospi_model);

Uses IF_SD, too?

> diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
> index 4fdb153e4d8..70fb444bbd9 100644
> --- a/hw/arm/xlnx-zcu102.c
> +++ b/hw/arm/xlnx-zcu102.c
> @@ -280,7 +280,6 @@ static void xlnx_zcu102_machine_class_init(ObjectClass *oc, 
> void *data)
>       mc->max_cpus = XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS;
>       mc->default_cpus = XLNX_ZYNQMP_NUM_APU_CPUS;
>       mc->default_ram_id = "ddr-ram";
> -    mc->auto_create_sdcard = true;
>   
>       machine_add_audiodev_property(mc);
>       object_class_property_add_bool(oc, "secure", zcu102_get_secure,

dito ?

 Thomas