diff options
author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-11-25 15:26:15 +0100 |
---|---|---|
committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-02-16 14:25:08 +0100 |
commit | 8a2f1f921cc84cae3aa54c29e24e8c1defc9ef34 (patch) | |
tree | e224ba84a8a17cfd29913bca6c4e9c0bb2918efc /hw/mips | |
parent | e3660f60dca85de599c913fda1d156f20495b45a (diff) | |
download | qemu-8a2f1f921cc84cae3aa54c29e24e8c1defc9ef34.zip qemu-8a2f1f921cc84cae3aa54c29e24e8c1defc9ef34.tar.gz qemu-8a2f1f921cc84cae3aa54c29e24e8c1defc9ef34.tar.bz2 |
hw/boards: Explicit no_sdcard=false as ON_OFF_AUTO_OFF
Update MachineClass::no_sdcard default implicit AUTO
initialization to explicit OFF. This flag is consumed
in system/vl.c::qemu_disable_default_devices(). Use
this place to assert we don't have anymore AUTO state.
In hw/ppc/e500.c we add the ppce500_machine_class_init()
method to initialize once all the inherited classes.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20250204200934.65279-3-philmd@linaro.org>
Diffstat (limited to 'hw/mips')
-rw-r--r-- | hw/mips/boston.c | 1 | ||||
-rw-r--r-- | hw/mips/fuloong2e.c | 1 | ||||
-rw-r--r-- | hw/mips/jazz.c | 2 | ||||
-rw-r--r-- | hw/mips/loongson3_virt.c | 1 | ||||
-rw-r--r-- | hw/mips/malta.c | 1 | ||||
-rw-r--r-- | hw/mips/mipssim.c | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 364c328..bd9059a 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -842,6 +842,7 @@ static void boston_mach_class_init(MachineClass *mc) mc->default_ram_id = "boston.ddr"; mc->max_cpus = 16; mc->default_cpu_type = MIPS_CPU_TYPE_NAME("I6400"); + mc->no_sdcard = ON_OFF_AUTO_OFF; } DEFINE_MACHINE("boston", boston_mach_class_init) diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 646044e..83e95c3 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -335,6 +335,7 @@ static void mips_fuloong2e_machine_init(MachineClass *mc) mc->default_ram_size = 256 * MiB; mc->default_ram_id = "fuloong2e.ram"; mc->minimum_page_bits = 14; + mc->no_sdcard = ON_OFF_AUTO_OFF; machine_add_audiodev_property(mc); } diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index c896106..326f60c 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -424,6 +424,7 @@ static void mips_magnum_class_init(ObjectClass *oc, void *data) mc->block_default_type = IF_SCSI; mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); mc->default_ram_id = "mips_jazz.ram"; + mc->no_sdcard = ON_OFF_AUTO_OFF; } static const TypeInfo mips_magnum_type = { @@ -441,6 +442,7 @@ static void mips_pica61_class_init(ObjectClass *oc, void *data) mc->block_default_type = IF_SCSI; mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); mc->default_ram_id = "mips_jazz.ram"; + mc->no_sdcard = ON_OFF_AUTO_OFF; } static const TypeInfo mips_pica61_type = { diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 831fddb..f44932b 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -679,6 +679,7 @@ static void loongson3v_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size = 1600 * MiB; mc->minimum_page_bits = 14; mc->default_nic = "virtio-net-pci"; + mc->no_sdcard = ON_OFF_AUTO_OFF; } static const TypeInfo loongson3_machine_types[] = { diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 8e9cea7..13811f8 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1306,6 +1306,7 @@ static void mips_malta_machine_init(MachineClass *mc) mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); #endif mc->default_ram_id = "mips_malta.ram"; + mc->no_sdcard = ON_OFF_AUTO_OFF; compat_props_add(mc->compat_props, malta_compat, malta_compat_len); } diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c index c530688..f0d06ab 100644 --- a/hw/mips/mipssim.c +++ b/hw/mips/mipssim.c @@ -247,6 +247,7 @@ static void mips_mipssim_machine_init(MachineClass *mc) mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); #endif mc->default_ram_id = "mips_mipssim.ram"; + mc->no_sdcard = ON_OFF_AUTO_OFF; } DEFINE_MACHINE("mipssim", mips_mipssim_machine_init) |