hw/boards: Rename no_sdcard -> auto_create_sdcard

Invert the 'no_sdcard' logic, renaming it as the more explicit
"auto_create_sdcard". Machines are supposed to create a SD Card
drive when this flag is set. In many cases it doesn't make much
sense (as boards don't expose SD Card host controller), but this
is patch only aims to expose that nonsense; so no logical change
intended (mechanical patch using gsed).

Most of the changes are:

  -    mc->no_sdcard = ON_OFF_AUTO_OFF;
  +    mc->auto_create_sdcard = true;

Except in
 . hw/core/null-machine.c
 . hw/arm/xilinx_zynq.c
 . hw/s390x/s390-virtio-ccw.c
where the disabled option is manually removed (since default):

  -    mc->no_sdcard = ON_OFF_AUTO_ON;
  +    mc->auto_create_sdcard = false;
  -    mc->auto_create_sdcard = false;

and in system/vl.c we change the 'default_sdcard' type to boolean.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20250204200934.65279-4-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-11-25 18:26:48 +01:00
parent 8a2f1f921c
commit cdc8d7cada
102 changed files with 156 additions and 160 deletions

View file

@ -213,7 +213,7 @@ static void clipper_machine_init(MachineClass *mc)
mc->default_cpu_type = ALPHA_CPU_TYPE_NAME("ev67");
mc->default_ram_id = "ram";
mc->default_nic = "e1000";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("clipper", clipper_machine_init)

View file

@ -1253,7 +1253,7 @@ static void aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data)
amc->spi_model = "mx25l25635f";
amc->num_cs = 1;
amc->i2c_init = palmetto_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 256 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1270,7 +1270,7 @@ static void aspeed_machine_quanta_q71l_class_init(ObjectClass *oc, void *data)
amc->spi_model = "mx25l25635e";
amc->num_cs = 1;
amc->i2c_init = quanta_q71l_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 128 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
}
@ -1289,7 +1289,7 @@ static void aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc,
amc->num_cs = 1;
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
amc->i2c_init = palmetto_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 256 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
}
@ -1308,7 +1308,7 @@ static void aspeed_machine_supermicro_x11spi_bmc_class_init(ObjectClass *oc,
amc->num_cs = 1;
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
amc->i2c_init = palmetto_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
}
@ -1325,7 +1325,7 @@ static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data)
amc->spi_model = "mx25l25635f";
amc->num_cs = 1;
amc->i2c_init = ast2500_evb_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1343,7 +1343,7 @@ static void aspeed_machine_yosemitev2_class_init(ObjectClass *oc, void *data)
amc->spi_model = "mx25l25635e";
amc->num_cs = 2;
amc->i2c_init = yosemitev2_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1360,7 +1360,7 @@ static void aspeed_machine_romulus_class_init(ObjectClass *oc, void *data)
amc->spi_model = "mx66l1g45g";
amc->num_cs = 2;
amc->i2c_init = romulus_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1378,7 +1378,7 @@ static void aspeed_machine_tiogapass_class_init(ObjectClass *oc, void *data)
amc->spi_model = "mx25l25635e";
amc->num_cs = 2;
amc->i2c_init = tiogapass_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1395,7 +1395,7 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data)
amc->spi_model = "mx66l1g45g";
amc->num_cs = 2;
amc->i2c_init = sonorapass_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1412,7 +1412,7 @@ static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data)
amc->spi_model = "mx66l1g45g";
amc->num_cs = 2;
amc->i2c_init = witherspoon_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1433,7 +1433,7 @@ static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, void *data)
ASPEED_MAC3_ON;
amc->sdhci_wp_inverted = true;
amc->i2c_init = ast2600_evb_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
aspeed_machine_class_init_cpus_defaults(mc);
aspeed_machine_ast2600_class_emmc_init(oc);
@ -1452,7 +1452,7 @@ static void aspeed_machine_g220a_class_init(ObjectClass *oc, void *data)
amc->num_cs = 2;
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
amc->i2c_init = g220a_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1024 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1470,7 +1470,7 @@ static void aspeed_machine_fp5280g2_class_init(ObjectClass *oc, void *data)
amc->num_cs = 2;
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON;
amc->i2c_init = fp5280g2_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1489,7 +1489,7 @@ static void aspeed_machine_rainier_class_init(ObjectClass *oc, void *data)
amc->num_cs = 2;
amc->macs_mask = ASPEED_MAC2_ON | ASPEED_MAC3_ON;
amc->i2c_init = rainier_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
aspeed_machine_class_init_cpus_defaults(mc);
aspeed_machine_ast2600_class_emmc_init(oc);
@ -1512,7 +1512,7 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data)
amc->macs_mask = ASPEED_MAC3_ON;
amc->i2c_init = fuji_bmc_i2c_init;
amc->uart_default = ASPEED_DEV_UART1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = FUJI_BMC_RAM_SIZE;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1533,7 +1533,7 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data)
amc->num_cs = 2;
amc->macs_mask = ASPEED_MAC2_ON;
amc->i2c_init = bletchley_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = BLETCHLEY_BMC_RAM_SIZE;
aspeed_machine_class_init_cpus_defaults(mc);
}
@ -1575,7 +1575,7 @@ static void aspeed_machine_fby35_class_init(ObjectClass *oc, void *data)
amc->num_cs = 2;
amc->macs_mask = ASPEED_MAC3_ON;
amc->i2c_init = fby35_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
/* FIXME: Replace this macro with something more general */
mc->default_ram_size = FUJI_BMC_RAM_SIZE;
aspeed_machine_class_init_cpus_defaults(mc);
@ -1658,7 +1658,7 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc,
amc->spi_model = "w25q256";
amc->num_cs = 2;
amc->macs_mask = 0;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
aspeed_machine_class_init_cpus_defaults(mc);
}
@ -1687,7 +1687,7 @@ static void aspeed_machine_ast2700_evb_class_init(ObjectClass *oc, void *data)
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON;
amc->uart_default = ASPEED_DEV_UART12;
amc->i2c_init = ast2700_evb_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
aspeed_machine_class_init_cpus_defaults(mc);
}
@ -1708,7 +1708,7 @@ static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc,
amc->num_cs = 2;
amc->macs_mask = ASPEED_MAC2_ON | ASPEED_MAC3_ON;
amc->i2c_init = qcom_dc_scm_bmc_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
aspeed_machine_class_init_cpus_defaults(mc);
};
@ -1728,7 +1728,7 @@ static void aspeed_machine_qcom_firework_class_init(ObjectClass *oc,
amc->num_cs = 2;
amc->macs_mask = ASPEED_MAC2_ON | ASPEED_MAC3_ON;
amc->i2c_init = qcom_dc_scm_firework_i2c_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
aspeed_machine_class_init_cpus_defaults(mc);
};

View file

@ -120,7 +120,7 @@ static void bl475e_machine_init(ObjectClass *oc, void *data)
mc->desc = "B-L475E-IOT01A Discovery Kit (Cortex-M4)";
mc->init = bl475e_init;
mc->valid_cpu_types = machine_valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
/* SRAM pre-allocated as part of the SoC instantiation */
mc->default_ram_size = 0;

View file

@ -141,7 +141,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("bpim2u", bpim2u_machine_init)

View file

@ -79,7 +79,7 @@ static void collie_machine_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");
mc->default_ram_size = RAM_SIZE;
mc->default_ram_id = "strongarm.sdram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo collie_machine_typeinfo = {

View file

@ -122,7 +122,7 @@ static void cubieboard_machine_init(MachineClass *mc)
mc->units_per_default_bus = 1;
mc->ignore_memory_transaction_failures = true;
mc->default_ram_id = "cubieboard.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("cubieboard", cubieboard_machine_init)

View file

@ -143,7 +143,7 @@ static void canon_a1100_machine_init(MachineClass *mc)
mc->ignore_memory_transaction_failures = true;
mc->default_ram_size = 64 * MiB;
mc->default_ram_id = "ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init)

View file

@ -165,7 +165,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo nuri_type = {
@ -185,7 +185,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo smdkc210_type = {

View file

@ -170,7 +170,7 @@ static void fby35_class_init(ObjectClass *oc, void *data)
mc->init = fby35_init;
mc->no_floppy = 1;
mc->no_cdrom = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->min_cpus = mc->max_cpus = mc->default_cpus = 3;
object_class_property_add_bool(oc, "execute-in-place",

View file

@ -357,7 +357,7 @@ static void highbank_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 4;
mc->ignore_memory_transaction_failures = true;
mc->default_ram_id = "highbank.dram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo highbank_type = {
@ -382,7 +382,7 @@ static void midway_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 4;
mc->ignore_memory_transaction_failures = true;
mc->default_ram_id = "highbank.dram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo midway_type = {

View file

@ -147,7 +147,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init)

View file

@ -688,7 +688,7 @@ static void integratorcp_machine_init(MachineClass *mc)
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
mc->default_ram_id = "integrator.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}

View file

@ -137,7 +137,7 @@ static void kzm_machine_init(MachineClass *mc)
mc->init = kzm_init;
mc->ignore_memory_transaction_failures = true;
mc->default_ram_id = "kzm.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("kzm", kzm_machine_init)

View file

@ -74,6 +74,6 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init)

View file

@ -74,6 +74,6 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init)

View file

@ -67,7 +67,7 @@ static void microbit_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "BBC micro:bit (Cortex-M0)";
mc->init = microbit_init;
mc->max_cpus = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo microbit_info = {

View file

@ -1320,7 +1320,7 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data)
mmc->fpga_type = FPGA_AN505;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->scc_id = 0x41045050;
mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */
mmc->apb_periph_frq = mmc->sysclk_frq;
@ -1355,7 +1355,7 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data)
mmc->fpga_type = FPGA_AN521;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->scc_id = 0x41045210;
mmc->sysclk_frq = 20 * 1000 * 1000; /* 20MHz */
mmc->apb_periph_frq = mmc->sysclk_frq;
@ -1390,7 +1390,7 @@ static void mps3tz_an524_class_init(ObjectClass *oc, void *data)
mmc->fpga_type = FPGA_AN524;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m33");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->scc_id = 0x41045240;
mmc->sysclk_frq = 32 * 1000 * 1000; /* 32MHz */
mmc->apb_periph_frq = mmc->sysclk_frq;
@ -1430,7 +1430,7 @@ static void mps3tz_an547_class_init(ObjectClass *oc, void *data)
mmc->fpga_type = FPGA_AN547;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m55");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->scc_id = 0x41055470;
mmc->sysclk_frq = 32 * 1000 * 1000; /* 32MHz */
mmc->apb_periph_frq = 25 * 1000 * 1000; /* 25MHz */

View file

@ -487,7 +487,7 @@ static void mps2_an385_class_init(ObjectClass *oc, void *data)
mmc->fpga_type = FPGA_AN385;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->scc_id = 0x41043850;
mmc->psram_base = 0x21000000;
mmc->ethernet_base = 0x40200000;
@ -507,7 +507,7 @@ static void mps2_an386_class_init(ObjectClass *oc, void *data)
mmc->fpga_type = FPGA_AN386;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m4");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->scc_id = 0x41043860;
mmc->psram_base = 0x21000000;
mmc->ethernet_base = 0x40200000;
@ -527,7 +527,7 @@ static void mps2_an500_class_init(ObjectClass *oc, void *data)
mmc->fpga_type = FPGA_AN500;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m7");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->scc_id = 0x41045000;
mmc->psram_base = 0x60000000;
mmc->ethernet_base = 0xa0000000;
@ -547,7 +547,7 @@ static void mps2_an511_class_init(ObjectClass *oc, void *data)
mmc->fpga_type = FPGA_AN511;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->scc_id = 0x41045110;
mmc->psram_base = 0x21000000;
mmc->ethernet_base = 0x40200000;

View file

@ -618,7 +618,7 @@ static void mps3r_an536_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 2;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-r52");
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->raminfo = an536_raminfo;
mps3r_set_default_ram_info(mmc);
}

View file

@ -106,7 +106,7 @@ static void emcraft_sf2_machine_init(MachineClass *mc)
mc->desc = "SmartFusion2 SOM kit from Emcraft (M2S010)";
mc->init = emcraft_sf2_s2s010_init;
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init)

View file

@ -615,7 +615,7 @@ static void musca_a_class_init(ObjectClass *oc, void *data)
MuscaMachineClass *mmc = MUSCA_MACHINE_CLASS(oc);
mc->desc = "ARM Musca-A board (dual Cortex-M33)";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->type = MUSCA_A;
mmc->init_svtor = 0x10200000;
mmc->sram_addr_width = 15;
@ -630,7 +630,7 @@ static void musca_b1_class_init(ObjectClass *oc, void *data)
MuscaMachineClass *mmc = MUSCA_MACHINE_CLASS(oc);
mc->desc = "ARM Musca-B1 board (dual Cortex-M33)";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mmc->type = MUSCA_B1;
/*
* This matches the DAPlink firmware which boots from QSPI. There

View file

@ -1342,7 +1342,7 @@ static void musicpal_machine_init(MachineClass *mc)
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
mc->default_ram_size = MP_RAM_DEFAULT_SIZE;
mc->default_ram_id = "musicpal.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}

View file

@ -63,7 +63,7 @@ static void netduino2_machine_init(MachineClass *mc)
mc->init = netduino2_init;
mc->valid_cpu_types = valid_cpu_types;
mc->ignore_memory_transaction_failures = true;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("netduino2", netduino2_machine_init)

View file

@ -63,7 +63,7 @@ static void netduinoplus2_machine_init(MachineClass *mc)
mc->desc = "Netduino Plus 2 Machine (Cortex-M4)";
mc->init = netduinoplus2_init;
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init)

View file

@ -481,7 +481,7 @@ static void npcm750_evb_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "Nuvoton NPCM750 Evaluation Board (Cortex-A9)";
mc->init = npcm750_evb_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
};
@ -494,7 +494,7 @@ static void gsj_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "Quanta GSJ (Cortex-A9)";
mc->init = quanta_gsj_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 512 * MiB;
};
@ -507,7 +507,7 @@ static void gbs_bmc_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "Quanta GBS (Cortex-A9)";
mc->init = quanta_gbs_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
}
@ -520,7 +520,7 @@ static void kudo_bmc_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "Kudo BMC (Cortex-A9)";
mc->init = kudo_bmc_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
};
@ -533,7 +533,7 @@ static void mori_bmc_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "Mori BMC (Cortex-A9)";
mc->init = mori_bmc_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_ram_size = 1 * GiB;
}

View file

@ -66,7 +66,7 @@ static void olimex_stm32_h405_machine_init(MachineClass *mc)
mc->desc = "Olimex STM32-H405 (Cortex-M4)";
mc->init = olimex_stm32_h405_init;
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
/* SRAM pre-allocated as part of the SoC instantiation */
mc->default_ram_size = 0;

View file

@ -216,7 +216,7 @@ static void sx1_machine_v2_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
mc->default_ram_size = SDRAM_SIZE;
mc->default_ram_id = "omap1.dram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo sx1_machine_v2_type = {
@ -235,7 +235,7 @@ static void sx1_machine_v1_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
mc->default_ram_size = SDRAM_SIZE;
mc->default_ram_id = "omap1.dram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo sx1_machine_v1_type = {

View file

@ -121,7 +121,7 @@ static void orangepi_machine_init(MachineClass *mc)
mc->valid_cpu_types = valid_cpu_types;
mc->default_ram_size = 1 * GiB;
mc->default_ram_id = "orangepi.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("orangepi-pc", orangepi_machine_init)

View file

@ -342,7 +342,7 @@ static void raspi0_machine_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
rmc->board_rev = 0x920092; /* Revision 1.2 */
raspi_machine_class_init(mc, rmc->board_rev);
};
@ -352,7 +352,7 @@ static void raspi1ap_machine_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
rmc->board_rev = 0x900021; /* Revision 1.1 */
raspi_machine_class_init(mc, rmc->board_rev);
};
@ -362,7 +362,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
rmc->board_rev = 0xa21041;
raspi_machine_class_init(mc, rmc->board_rev);
};
@ -373,7 +373,7 @@ static void raspi3ap_machine_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
rmc->board_rev = 0x9020e0; /* Revision 1.0 */
raspi_machine_class_init(mc, rmc->board_rev);
};
@ -383,7 +383,7 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
rmc->board_rev = 0xa02082;
raspi_machine_class_init(mc, rmc->board_rev);
};

View file

@ -118,7 +118,7 @@ static void raspi4b_machine_class_init(ObjectClass *oc, void *data)
rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */
#endif
raspi_machine_class_common_init(mc, rmc->board_rev);
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->init = raspi4b_machine_init;
}

View file

@ -415,7 +415,7 @@ static void realview_eb_class_init(ObjectClass *oc, void *data)
mc->block_default_type = IF_SCSI;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}
@ -436,7 +436,7 @@ static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 4;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm11mpcore");
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}
@ -455,7 +455,7 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void *data)
mc->init = realview_pb_a8_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8");
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}
@ -475,7 +475,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 4;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}

View file

@ -110,7 +110,7 @@ static void sabrelite_machine_init(MachineClass *mc)
mc->max_cpus = FSL_IMX6_NUM_CPUS;
mc->ignore_memory_transaction_failures = true;
mc->default_ram_id = "sabrelite.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("sabrelite", sabrelite_machine_init)

View file

@ -900,7 +900,7 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data)
mc->minimum_page_bits = 12;
mc->block_default_type = IF_IDE;
mc->no_cdrom = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_nic = "e1000e";
mc->default_ram_size = 1 * GiB;
mc->default_ram_id = "sbsa-ref.ram";

View file

@ -1421,7 +1421,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo lm3s811evb_type = {
@ -1442,7 +1442,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data)
mc->init = lm3s6965evb_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m3");
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo lm3s6965evb_type = {

View file

@ -66,7 +66,7 @@ static void stm32vldiscovery_machine_init(MachineClass *mc)
mc->desc = "ST STM32VLDISCOVERY (Cortex-M3)";
mc->init = stm32vldiscovery_init;
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init)

View file

@ -419,7 +419,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}
@ -440,7 +440,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}

View file

@ -803,7 +803,7 @@ static void vexpress_a9_class_init(ObjectClass *oc, void *data)
mc->desc = "ARM Versatile Express for Cortex-A9";
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
vmc->daughterboard = &a9_daughterboard;
}
@ -819,7 +819,7 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data)
mc->desc = "ARM Versatile Express for Cortex-A15";
mc->valid_cpu_types = valid_cpu_types;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
vmc->daughterboard = &a15_daughterboard;

View file

@ -3125,7 +3125,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
#endif
mc->block_default_type = IF_VIRTIO;
mc->no_cdrom = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->pci_allow_0_address = true;
/* We know we will never create a pre-ARMv7 CPU which needs 1K pages */
mc->minimum_page_bits = 12;

View file

@ -75,7 +75,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
* mc->max_cpus, QEMU will bail out with an error message.
*/
mc->max_cpus = GUEST_MAX_VCPUS;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
/* Xen/ARM does not use buffered IOREQs. */
xpc->handle_bufioreq = HVM_IOREQSRV_BUFIOREQ_OFF;

View file

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

View file

@ -818,7 +818,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
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);

View file

@ -280,7 +280,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
object_class_property_add_bool(oc, "secure", zcu102_get_secure,

View file

@ -67,7 +67,7 @@ static void arduino_machine_class_init(ObjectClass *oc, void *data)
mc->no_floppy = 1;
mc->no_cdrom = 1;
mc->no_parallel = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static void arduino_duemilanove_class_init(ObjectClass *oc, void *data)

View file

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

View file

@ -704,7 +704,7 @@ static void HP_B160L_machine_init_class_init(ObjectClass *oc, void *data)
mc->default_boot_order = "cd";
mc->default_ram_id = "ram";
mc->default_nic = "tulip";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
nc->nmi_monitor_handler = hppa_nmi;
}
@ -741,7 +741,7 @@ static void HP_C3700_machine_init_class_init(ObjectClass *oc, void *data)
mc->default_boot_order = "cd";
mc->default_ram_id = "ram";
mc->default_nic = "tulip";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
nc->nmi_monitor_handler = hppa_nmi;
}

View file

@ -1799,7 +1799,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
mc->smp_props.dies_supported = true;
mc->smp_props.modules_supported = true;
mc->default_ram_id = "pc.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_AUTO;
object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",

View file

@ -382,7 +382,7 @@ static void x86_machine_class_init(ObjectClass *oc, void *data)
mc->get_default_cpu_node_id = x86_get_default_cpu_node_id;
mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids;
mc->kvm_type = x86_kvm_type;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
x86mc->save_tsc_khz = true;
x86mc->fwcfg_dma_enabled = true;
nc->nmi_monitor_handler = x86_nmi;

View file

@ -82,7 +82,7 @@ static void xen_pvh_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "Xen PVH x86 machine";
mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
/* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts. */
mc->max_cpus = HVM_MAX_VCPUS;

View file

@ -954,7 +954,7 @@ static void virt_class_init(ObjectClass *oc, void *data)
mc->block_default_type = IF_VIRTIO;
mc->default_boot_order = "c";
mc->no_cdrom = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->possible_cpu_arch_ids = virt_possible_cpu_arch_ids;
mc->cpu_index_to_instance_props = virt_cpu_index_to_props;
mc->get_default_cpu_node_id = virt_get_default_cpu_node_id;

View file

@ -99,7 +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;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("an5206", an5206_machine_init)

View file

@ -398,7 +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;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init)

View file

@ -1359,7 +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;
mc->auto_create_sdcard = true;
}
static const TypeInfo next_typeinfo = {

View file

@ -743,7 +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;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
compat_props_add(mc->compat_props, hw_compat_q800, hw_compat_q800_len);

View file

@ -318,7 +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->auto_create_sdcard = true;
mc->default_ram_id = "m68k_virt.ram";
}

View file

@ -220,7 +220,7 @@ static void petalogix_ml605_machine_init(MachineClass *mc)
mc->desc = "PetaLogix linux refdesign for xilinx ml605 (little endian)";
#endif
mc->init = petalogix_ml605_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init)

View file

@ -142,7 +142,7 @@ static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data)
mc->desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800";
mc->init = petalogix_s3adsp1800_init;
mc->is_default = true;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo petalogix_s3adsp1800_machine_types[] = {

View file

@ -188,7 +188,7 @@ static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc)
mc->desc = "Xilinx ZynqMP PMU machine (little endian)";
#endif
mc->init = xlnx_zynqmp_pmu_init;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("xlnx-zynqmp-pmu", xlnx_zynqmp_pmu_machine_init)

View file

@ -842,7 +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;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("boston", boston_mach_class_init)

View file

@ -335,7 +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;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}

View file

@ -424,7 +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;
mc->auto_create_sdcard = true;
}
static const TypeInfo mips_magnum_type = {
@ -442,7 +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;
mc->auto_create_sdcard = true;
}
static const TypeInfo mips_pica61_type = {

View file

@ -679,7 +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;
mc->auto_create_sdcard = true;
}
static const TypeInfo loongson3_machine_types[] = {

View file

@ -1306,7 +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;
mc->auto_create_sdcard = true;
compat_props_add(mc->compat_props, malta_compat, malta_compat_len);
}

View file

@ -247,7 +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;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("mipssim", mips_mipssim_machine_init)

View file

@ -368,7 +368,7 @@ static void openrisc_sim_machine_init(ObjectClass *oc, void *data)
mc->max_cpus = OR1KSIM_CPUS_MAX;
mc->is_default = true;
mc->default_cpu_type = OPENRISC_CPU_TYPE_NAME("or1200");
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo or1ksim_machine_typeinfo = {

View file

@ -554,7 +554,7 @@ static void openrisc_virt_machine_init(ObjectClass *oc, void *data)
mc->max_cpus = VIRT_CPUS_MAX;
mc->is_default = false;
mc->default_cpu_type = OPENRISC_CPU_TYPE_NAME("or1200");
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo or1ksim_machine_typeinfo = {

View file

@ -173,7 +173,7 @@ static void amigaone_machine_init(MachineClass *mc)
mc->default_display = "std";
mc->default_ram_id = "ram";
mc->default_ram_size = 512 * MiB;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("amigaone", amigaone_machine_init)

View file

@ -100,7 +100,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");
mc->default_ram_id = "mpc8544ds.ram";
mc->default_nic = "virtio-net-pci";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_ETSEC_COMMON);
}

View file

@ -580,7 +580,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
mc->default_boot_order = "cd";
mc->default_display = "std";
mc->default_nic = "sungem";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->kvm_type = core99_kvm_type;
#ifdef TARGET_PPC64
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("970fx_v3.1");

View file

@ -427,7 +427,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data)
mc->default_nic = "ne2k_pci";
mc->ignore_boot_device_suffixes = true;
mc->default_ram_id = "ppc_heathrow.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
fwc->get_dev_path = heathrow_fw_dev_path;
}

View file

@ -62,7 +62,7 @@ static void mpc8544ds_machine_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("e500v2_v30");
mc->default_ram_id = "mpc8544ds.ram";
mc->default_nic = "virtio-net-pci";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
#define TYPE_MPC8544DS_MACHINE MACHINE_TYPE_NAME("mpc8544ds")

View file

@ -604,7 +604,7 @@ static void pegasos2_machine_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7457_v1.2");
mc->default_ram_id = "pegasos2.ram";
mc->default_ram_size = 512 * MiB;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
vhc->cpu_in_nested = pegasos2_cpu_in_nested;

View file

@ -2878,7 +2878,7 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data)
/* Pnv provides a AHCI device for storage */
mc->block_default_type = IF_IDE;
mc->no_parallel = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_boot_order = NULL;
/*
* RAM defaults to less than 2048 for 32-bit hosts, and large

View file

@ -351,7 +351,7 @@ static void ppc405_machine_class_init(ObjectClass *oc, void *data)
mc->default_ram_size = 128 * MiB;
mc->default_ram_id = "ppc405.ram";
mc->deprecation_reason = "machine is old and unmaintained";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo ppc405_machine_type = {

View file

@ -268,7 +268,7 @@ static void bamboo_machine_init(MachineClass *mc)
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("440epb");
mc->default_ram_id = "ppc4xx.sdram";
mc->default_nic = "e1000";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("bamboo", bamboo_machine_init)

View file

@ -428,7 +428,7 @@ static void ibm_40p_machine_init(MachineClass *mc)
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("604");
mc->default_display = "std";
mc->default_nic = "pcnet";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
}

View file

@ -524,7 +524,7 @@ static void sam460ex_machine_init(MachineClass *mc)
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("460exb");
mc->default_ram_size = 512 * MiB;
mc->default_ram_id = "ppc4xx.sdram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("sam460ex", sam460ex_machine_init)

View file

@ -4594,7 +4594,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
mc->max_cpus = SPAPR_IRQ_NR_IPIS;
mc->no_parallel = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
mc->default_boot_order = "";
mc->default_ram_size = 512 * MiB;
mc->default_ram_id = "ppc_spapr.ram";

View file

@ -288,7 +288,7 @@ static void virtex_machine_init(MachineClass *mc)
mc->init = virtex_init;
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("440-xilinx");
mc->default_ram_id = "ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("virtex-ml507", virtex_machine_init)

View file

@ -128,7 +128,7 @@ static void remote_machine_class_init(ObjectClass *oc, void *data)
mc->init = remote_machine_init;
mc->desc = "Experimental remote machine";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
hc->unplug = remote_machine_dev_unplug_cb;

View file

@ -650,7 +650,7 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data)
mc->min_cpus = MICROCHIP_PFSOC_MANAGEMENT_CPU_COUNT + 1;
mc->default_cpus = mc->min_cpus;
mc->default_ram_id = "microchip.icicle.kit.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
/*
* Map 513 MiB high memory, the minimum required high memory size, because

View file

@ -121,7 +121,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static void lowrisc_ibex_soc_init(Object *obj)

View file

@ -84,7 +84,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo shakti_c_machine_type_info = {

View file

@ -153,7 +153,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
object_class_property_add_bool(oc, "revb", sifive_e_machine_get_revb,
sifive_e_machine_set_revb);

View file

@ -724,7 +724,7 @@ static void sifive_u_machine_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = SIFIVE_U_CPU;
mc->default_cpus = mc->min_cpus;
mc->default_ram_id = "riscv.sifive.u.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
object_class_property_add_bool(oc, "start-in-flash",
sifive_u_machine_get_start_in_flash,

View file

@ -358,7 +358,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
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");

View file

@ -1918,7 +1918,7 @@ 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->no_sdcard = ON_OFF_AUTO_OFF;
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;

View file

@ -166,7 +166,7 @@ static void rx_gdbsim_class_init(ObjectClass *oc, void *data)
mc->default_cpu_type = TYPE_RX62N_CPU;
mc->default_ram_size = 16 * MiB;
mc->default_ram_id = "ext-sdram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static void rx62n7_class_init(ObjectClass *oc, void *data)

View file

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

View file

@ -383,7 +383,7 @@ static void r2d_machine_init(MachineClass *mc)
mc->block_default_type = IF_IDE;
mc->default_cpu_type = TYPE_SH7751R_CPU;
mc->default_nic = "rtl8139";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("r2d", r2d_machine_init)

View file

@ -440,7 +440,7 @@ static void leon3_generic_machine_init(MachineClass *mc)
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("LEON3");
mc->default_ram_id = "leon3.ram";
mc->max_cpus = MAX_CPUS;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init)

View file

@ -1113,7 +1113,7 @@ static void sun4m_machine_class_init(ObjectClass *oc, void *data)
mc->default_boot_order = "c";
mc->default_display = "tcx";
mc->default_ram_id = "sun4m.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static void ss5_class_init(ObjectClass *oc, void *data)

View file

@ -167,7 +167,7 @@ static void niagara_class_init(ObjectClass *oc, void *data)
mc->default_boot_order = "c";
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Sun-UltraSparc-T1");
mc->default_ram_id = "sun4v-partition.ram";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo niagara_type = {

View file

@ -809,7 +809,7 @@ static void sun4u_class_init(ObjectClass *oc, void *data)
mc->default_display = "std";
mc->default_nic = "sunhme";
mc->no_parallel = !module_object_class_by_name(TYPE_ISA_PARALLEL);
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
fwc->get_dev_path = sun4u_fw_dev_path;
compat_props_add(mc->compat_props, hw_compat_sparc64, hw_compat_sparc64_len);
}
@ -837,7 +837,7 @@ static void sun4v_class_init(ObjectClass *oc, void *data)
mc->default_display = "std";
mc->default_nic = "sunhme";
mc->no_parallel = !module_object_class_by_name(TYPE_ISA_PARALLEL);
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo sun4v_type = {

View file

@ -73,7 +73,7 @@ static void triboard_machine_tc277d_class_init(ObjectClass *oc,
mc->init = triboard_machine_init;
mc->desc = "Infineon AURIX TriBoard TC277 (D-Step)";
mc->max_cpus = 1;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
amc->soc_name = "tc277d-soc";
};

View file

@ -111,7 +111,7 @@ static void ttb_machine_init(MachineClass *mc)
mc->desc = "a minimal TriCore board";
mc->init = tricoreboard_init;
mc->default_cpu_type = TRICORE_CPU_TYPE_NAME("tc1796");
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("tricore_testboard", ttb_machine_init)

View file

@ -381,7 +381,7 @@ static void xen_pvh_class_init(ObjectClass *oc, void *data)
mc->default_machine_opts = "accel=xen";
/* Set to zero to make sure that the real ram size is passed. */
mc->default_ram_size = 0;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xen_pvh_info = {

View file

@ -67,7 +67,7 @@ static void xenpv_machine_init(MachineClass *mc)
mc->init = xen_init_pv;
mc->max_cpus = 1;
mc->default_machine_opts = "accel=xen";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("xenpv", xenpv_machine_init)

View file

@ -125,7 +125,7 @@ static void xtensa_sim_machine_init(MachineClass *mc)
mc->max_cpus = 4;
mc->no_serial = 1;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("sim", xtensa_sim_machine_init)

View file

@ -122,7 +122,7 @@ static void xtensa_virt_machine_init(MachineClass *mc)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
mc->default_nic = "virtio-net-pci";
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
DEFINE_MACHINE("virt", xtensa_virt_machine_init)

View file

@ -594,7 +594,7 @@ static void xtfpga_lx60_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
mc->default_ram_size = 64 * MiB;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_lx60_type = {
@ -612,7 +612,7 @@ static void xtfpga_lx60_nommu_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
mc->default_ram_size = 64 * MiB;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_lx60_nommu_type = {
@ -630,7 +630,7 @@ static void xtfpga_lx200_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
mc->default_ram_size = 96 * MiB;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_lx200_type = {
@ -648,7 +648,7 @@ static void xtfpga_lx200_nommu_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
mc->default_ram_size = 96 * MiB;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_lx200_nommu_type = {
@ -666,7 +666,7 @@ static void xtfpga_ml605_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
mc->default_ram_size = 512 * MiB - XTFPGA_MMU_RESERVED_MEMORY_SIZE;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_ml605_type = {
@ -684,7 +684,7 @@ static void xtfpga_ml605_nommu_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
mc->default_ram_size = 256 * MiB;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_ml605_nommu_type = {
@ -702,7 +702,7 @@ static void xtfpga_kc705_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
mc->default_ram_size = 1 * GiB - XTFPGA_MMU_RESERVED_MEMORY_SIZE;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_kc705_type = {
@ -720,7 +720,7 @@ static void xtfpga_kc705_nommu_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 32;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
mc->default_ram_size = 256 * MiB;
mc->no_sdcard = ON_OFF_AUTO_OFF;
mc->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_kc705_nommu_type = {

Some files were not shown because too many files have changed in this diff Show more