riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

hw/boards: Do not create unusable default if=sd drives 

A number of machines create an if=sd drive by default even though
they lack an SD bus, and therefore cannot use the drive.

This drive is created when the machine sets flag
@auto_create_sdcard.

See for example running HMP "info block" on the HPPA C3700 machine:

  $ qemu-system-hppa -M C3700 -monitor stdio -S
  (qemu) info block

  floppy0: [not inserted]
      Removable device: not locked, tray closed

  sd0: [not inserted]
      Removable device: not locked, tray closed

  $ qemu-system-hppa -M C3700 -sd /bin/sh
  qemu-system-hppa: -sd /bin/sh: machine type does not support if=sd,bus=0,unit=0

Delete that from machines that lack an SD bus.

Note, only the ARM and RISCV targets use such feature:

 $ git grep -wl IF_SD hw | cut -d/ -f-2 | sort -u
 hw/arm
 hw/riscv
 $

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20250204200934.65279-5-philmd@linaro.org>
pull/281/head
Philippe Mathieu-Daudé 1 year ago
parent
cdc8d7cada
commit
5824fad4e9
51 changed files with 0 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      hw/alpha/dp264.c
  2. 1
      hw/avr/arduino.c
  3. 2
      hw/hppa/machine.c
  4. 1
      hw/i386/pc.c
  5. 1
      hw/i386/x86.c
  6. 1
      hw/i386/xen/xen-pvh.c
  7. 1
      hw/loongarch/virt.c
  8. 1
      hw/m68k/an5206.c
  9. 1
      hw/m68k/mcf5208.c
  10. 1
      hw/m68k/next-cube.c
  11. 1
      hw/m68k/q800.c
  12. 1
      hw/m68k/virt.c
  13. 1
      hw/microblaze/petalogix_ml605_mmu.c
  14. 1
      hw/microblaze/petalogix_s3adsp1800_mmu.c
  15. 1
      hw/microblaze/xlnx-zynqmp-pmu.c
  16. 1
      hw/mips/boston.c
  17. 1
      hw/mips/fuloong2e.c
  18. 2
      hw/mips/jazz.c
  19. 1
      hw/mips/loongson3_virt.c
  20. 1
      hw/mips/malta.c
  21. 1
      hw/mips/mipssim.c
  22. 1
      hw/openrisc/openrisc_sim.c
  23. 1
      hw/openrisc/virt.c
  24. 1
      hw/ppc/amigaone.c
  25. 1
      hw/ppc/e500plat.c
  26. 1
      hw/ppc/mac_newworld.c
  27. 1
      hw/ppc/mac_oldworld.c
  28. 1
      hw/ppc/mpc8544ds.c
  29. 1
      hw/ppc/pegasos2.c
  30. 1
      hw/ppc/pnv.c
  31. 1
      hw/ppc/ppc405_boards.c
  32. 1
      hw/ppc/ppc440_bamboo.c
  33. 1
      hw/ppc/prep.c
  34. 1
      hw/ppc/sam460ex.c
  35. 1
      hw/ppc/spapr.c
  36. 1
      hw/ppc/virtex_ml507.c
  37. 1
      hw/remote/machine.c
  38. 1
      hw/rx/rx-gdbsim.c
  39. 1
      hw/sh4/r2d.c
  40. 1
      hw/sparc/leon3.c
  41. 1
      hw/sparc/sun4m.c
  42. 1
      hw/sparc64/niagara.c
  43. 2
      hw/sparc64/sun4u.c
  44. 1
      hw/tricore/triboard.c
  45. 1
      hw/tricore/tricore_testboard.c
  46. 1
      hw/xen/xen-pvh-common.c
  47. 1
      hw/xenpv/xen_machine_pv.c
  48. 1
      hw/xtensa/sim.c
  49. 1
      hw/xtensa/virt.c
  50. 8
      hw/xtensa/xtfpga.c
  51. 60
      tests/qemu-iotests/172.out

1
hw/alpha/dp264.c
View File

@ -213,7 +213,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("clipper", clipper_machine_init)

1
hw/avr/arduino.c
View File

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

2
hw/hppa/machine.c
View File

@ -704,7 +704,6 @@ 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->auto_create_sdcard = true;
nc->nmi_monitor_handler = hppa_nmi;
}
@ -741,7 +740,6 @@ 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->auto_create_sdcard = true;
nc->nmi_monitor_handler = hppa_nmi;
}

1
hw/i386/pc.c
View File

@ -1799,7 +1799,6 @@ 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->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",

1
hw/i386/x86.c
View File

@ -382,7 +382,6 @@ 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->auto_create_sdcard = true;
x86mc->save_tsc_khz = true;
x86mc->fwcfg_dma_enabled = true;
nc->nmi_monitor_handler = x86_nmi;

1
hw/i386/xen/xen-pvh.c
View File

@ -82,7 +82,6 @@ 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->auto_create_sdcard = true;
/* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts. */
mc->max_cpus = HVM_MAX_VCPUS;

1
hw/loongarch/virt.c
View File

@ -954,7 +954,6 @@ 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->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;

1
hw/m68k/an5206.c
View File

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

1
hw/m68k/mcf5208.c
View File

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

1
hw/m68k/next-cube.c
View File

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

1
hw/m68k/q800.c
View File

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

1
hw/m68k/virt.c
View File

@ -318,7 +318,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 1;
mc->no_floppy = 1;
mc->no_parallel = 1;
mc->auto_create_sdcard = true;
mc->default_ram_id = "m68k_virt.ram";
}

1
hw/microblaze/petalogix_ml605_mmu.c
View File

@ -220,7 +220,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init)

1
hw/microblaze/petalogix_s3adsp1800_mmu.c
View File

@ -142,7 +142,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo petalogix_s3adsp1800_machine_types[] = {

1
hw/microblaze/xlnx-zynqmp-pmu.c
View File

@ -188,7 +188,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("xlnx-zynqmp-pmu", xlnx_zynqmp_pmu_machine_init)

1
hw/mips/boston.c
View File

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

1
hw/mips/fuloong2e.c
View File

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

2
hw/mips/jazz.c
View File

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

1
hw/mips/loongson3_virt.c
View File

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

1
hw/mips/malta.c
View File

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

1
hw/mips/mipssim.c
View File

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

1
hw/openrisc/openrisc_sim.c
View File

@ -368,7 +368,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo or1ksim_machine_typeinfo = {

1
hw/openrisc/virt.c
View File

@ -554,7 +554,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo or1ksim_machine_typeinfo = {

1
hw/ppc/amigaone.c
View File

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

1
hw/ppc/e500plat.c
View File

@ -100,7 +100,6 @@ 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->auto_create_sdcard = true;
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_ETSEC_COMMON);
}

1
hw/ppc/mac_newworld.c
View File

@ -580,7 +580,6 @@ static void core99_machine_class_init(ObjectClass *oc, void *data)
mc->default_boot_order = "cd";
mc->default_display = "std";
mc->default_nic = "sungem";
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");

1
hw/ppc/mac_oldworld.c
View File

@ -427,7 +427,6 @@ 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->auto_create_sdcard = true;
fwc->get_dev_path = heathrow_fw_dev_path;
}

1
hw/ppc/mpc8544ds.c
View File

@ -62,7 +62,6 @@ 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->auto_create_sdcard = true;
}
#define TYPE_MPC8544DS_MACHINE MACHINE_TYPE_NAME("mpc8544ds")

1
hw/ppc/pegasos2.c
View File

@ -604,7 +604,6 @@ 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->auto_create_sdcard = true;
machine_add_audiodev_property(mc);
vhc->cpu_in_nested = pegasos2_cpu_in_nested;

1
hw/ppc/pnv.c
View File

@ -2878,7 +2878,6 @@ 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->auto_create_sdcard = true;
mc->default_boot_order = NULL;
/*
* RAM defaults to less than 2048 for 32-bit hosts, and large

1
hw/ppc/ppc405_boards.c
View File

@ -351,7 +351,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo ppc405_machine_type = {

1
hw/ppc/ppc440_bamboo.c
View File

@ -268,7 +268,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("bamboo", bamboo_machine_init)

1
hw/ppc/prep.c
View File

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

1
hw/ppc/sam460ex.c
View File

@ -524,7 +524,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("sam460ex", sam460ex_machine_init)

1
hw/ppc/spapr.c
View File

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

1
hw/ppc/virtex_ml507.c
View File

@ -288,7 +288,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("virtex-ml507", virtex_machine_init)

1
hw/remote/machine.c
View File

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

1
hw/rx/rx-gdbsim.c
View File

@ -166,7 +166,6 @@ 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->auto_create_sdcard = true;
}
static void rx62n7_class_init(ObjectClass *oc, void *data)

1
hw/sh4/r2d.c
View File

@ -383,7 +383,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("r2d", r2d_machine_init)

1
hw/sparc/leon3.c
View File

@ -440,7 +440,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init)

1
hw/sparc/sun4m.c
View File

@ -1113,7 +1113,6 @@ 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->auto_create_sdcard = true;
}
static void ss5_class_init(ObjectClass *oc, void *data)

1
hw/sparc64/niagara.c
View File

@ -167,7 +167,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo niagara_type = {

2
hw/sparc64/sun4u.c
View File

@ -809,7 +809,6 @@ 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->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 +836,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo sun4v_type = {

1
hw/tricore/triboard.c
View File

@ -73,7 +73,6 @@ 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->auto_create_sdcard = true;
amc->soc_name = "tc277d-soc";
};

1
hw/tricore/tricore_testboard.c
View File

@ -111,7 +111,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("tricore_testboard", ttb_machine_init)

1
hw/xen/xen-pvh-common.c
View File

@ -381,7 +381,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xen_pvh_info = {

1
hw/xenpv/xen_machine_pv.c
View File

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

1
hw/xtensa/sim.c
View File

@ -125,7 +125,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("sim", xtensa_sim_machine_init)

1
hw/xtensa/virt.c
View File

@ -122,7 +122,6 @@ 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->auto_create_sdcard = true;
}
DEFINE_MACHINE("virt", xtensa_virt_machine_init)

8
hw/xtensa/xtfpga.c
View File

@ -594,7 +594,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_lx60_type = {
@ -612,7 +611,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_lx60_nommu_type = {
@ -630,7 +628,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_lx200_type = {
@ -648,7 +645,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_lx200_nommu_type = {
@ -666,7 +662,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_ml605_type = {
@ -684,7 +679,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_ml605_nommu_type = {
@ -702,7 +696,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_kc705_type = {
@ -720,7 +713,6 @@ 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->auto_create_sdcard = true;
}
static const TypeInfo xtfpga_kc705_nommu_type = {

60
tests/qemu-iotests/172.out
View File

@ -68,9 +68,6 @@ floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -125,9 +122,6 @@ ide1-cd0: [not inserted]
floppy0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -183,9 +177,6 @@ floppy1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -265,9 +256,6 @@ floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -322,9 +310,6 @@ ide1-cd0: [not inserted]
floppy0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -380,9 +365,6 @@ floppy1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -422,9 +404,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -461,9 +440,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -519,9 +495,6 @@ none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -586,9 +559,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -644,9 +614,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -702,9 +669,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -760,9 +724,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -827,9 +788,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -885,9 +843,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -930,9 +885,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -1106,9 +1058,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -1145,9 +1094,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -1187,9 +1133,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit
@ -1226,9 +1169,6 @@ none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
ide1-cd0: [not inserted]
Attached to: /machine/unattached/device[N]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
(qemu) quit

Write Preview
Loading…
Cancel
Save