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/m68k | |
| 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/m68k')
| -rw-r--r-- | hw/m68k/an5206.c | 1 | ||||
| -rw-r--r-- | hw/m68k/mcf5208.c | 1 | ||||
| -rw-r--r-- | hw/m68k/next-cube.c | 1 | ||||
| -rw-r--r-- | hw/m68k/q800.c | 1 | ||||
| -rw-r--r-- | hw/m68k/virt.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index d97399b..286c3ba 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -99,6 +99,7 @@ static void an5206_machine_init(MachineClass *mc) mc->init = an5206_init; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5206"); mc->default_ram_id = "an5206.ram"; + mc->no_sdcard = ON_OFF_AUTO_OFF; } DEFINE_MACHINE("an5206", an5206_machine_init) diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 75cc076..a0c90d1 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -398,6 +398,7 @@ static void mcf5208evb_machine_init(MachineClass *mc) mc->is_default = true; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m5208"); mc->default_ram_id = "mcf5208.ram"; + mc->no_sdcard = ON_OFF_AUTO_OFF; } DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 0570e4a..06a4d82 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -1359,6 +1359,7 @@ static void next_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_id = "next.ram"; mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040"); mc->no_cdrom = true; + mc->no_sdcard = ON_OFF_AUTO_OFF; } static const TypeInfo next_typeinfo = { diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index aeed4c8..21fa56e 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -743,6 +743,7 @@ static void q800_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = 1; mc->block_default_type = IF_SCSI; mc->default_ram_id = "m68k_mac.ram"; + mc->no_sdcard = ON_OFF_AUTO_OFF; machine_add_audiodev_property(mc); compat_props_add(mc->compat_props, hw_compat_q800, hw_compat_q800_len); diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index d967bdd..a1bd9c4 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -318,6 +318,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = 1; mc->no_floppy = 1; mc->no_parallel = 1; + mc->no_sdcard = ON_OFF_AUTO_OFF; mc->default_ram_id = "m68k_virt.ram"; } |