motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 08:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/boards: Convert no_sdcard flag to OnOffAuto tri-state

Browse source 
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é <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20250204200934.65279-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-11-25 15:16:54 +01:00
parent 250e797cea
commit e3660f60dc
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/arm/xilinx_zynq.c
View file

@ -463,7 +463,7 @@ static void zynq_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "Xilinx Zynq Platform Baseboard for Cortex-A9"; mc->desc = "Xilinx Zynq Platform Baseboard for Cortex-A9";
mc->init = zynq_init; mc->init = zynq_init;
mc->max_cpus = ZYNQ_MAX_CPUS; mc->max_cpus = ZYNQ_MAX_CPUS;
mc->no_sdcard = 1; mc->no_sdcard = ON_OFF_AUTO_ON;
mc->ignore_memory_transaction_failures = true; mc->ignore_memory_transaction_failures = true;
mc->valid_cpu_types = valid_cpu_types; mc->valid_cpu_types = valid_cpu_types;
mc->default_ram_id = "zynq.ext_ram"; mc->default_ram_id = "zynq.ext_ram";

2
hw/core/null-machine.c
View file

@ -53,7 +53,7 @@ static void machine_none_machine_init(MachineClass *mc)
mc->no_parallel = 1; mc->no_parallel = 1;
mc->no_floppy = 1; mc->no_floppy = 1;
mc->no_cdrom = 1; mc->no_cdrom = 1;
mc->no_sdcard = 1; mc->no_sdcard = ON_OFF_AUTO_ON;
} }
DEFINE_MACHINE("none", machine_none_machine_init) DEFINE_MACHINE("none", machine_none_machine_init)

2
hw/s390x/s390-virtio-ccw.c
View file

@ -817,7 +817,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)
mc->no_cdrom = 1; mc->no_cdrom = 1;
mc->no_floppy = 1; mc->no_floppy = 1;
mc->no_parallel = 1; mc->no_parallel = 1;
mc->no_sdcard = 1; mc->no_sdcard = ON_OFF_AUTO_ON;
mc->max_cpus = S390_MAX_CPUS; mc->max_cpus = S390_MAX_CPUS;
mc->has_hotpluggable_cpus = true; mc->has_hotpluggable_cpus = true;
mc->smp_props.books_supported = true; mc->smp_props.books_supported = true;

2
include/hw/boards.h
View file

@ -283,9 +283,9 @@ struct MachineClass {
no_parallel:1, no_parallel:1,
no_floppy:1, no_floppy:1,
no_cdrom:1, no_cdrom:1,
no_sdcard:1,
pci_allow_0_address:1, pci_allow_0_address:1,
legacy_fw_cfg_order:1; legacy_fw_cfg_order:1;
OnOffAuto no_sdcard;
bool is_default; bool is_default;
const char *default_machine_opts; const char *default_machine_opts;
const char *default_boot_order; const char *default_boot_order;

2
system/vl.c
View file

@ -1346,7 +1346,7 @@ static void qemu_disable_default_devices(void)
if (!has_defaults || machine_class->no_cdrom) { if (!has_defaults || machine_class->no_cdrom) {
default_cdrom = 0; default_cdrom = 0;
} }
if (!has_defaults || machine_class->no_sdcard) { if (!has_defaults || machine_class->no_sdcard == ON_OFF_AUTO_ON) {
default_sdcard = 0; default_sdcard = 0;
} }
if (!has_defaults) { if (!has_defaults) {