Skip to content

Commit

Permalink
hw: Do not initialize MachineClass::is_default to 0
Browse files Browse the repository at this point in the history
The MachineClass is already zeroed on creation.

Note: The code setting is_default=0 in hw/i386/pc_piix.c is
      different (related to compat options). When adding a
      new versioned machine, we want it to be the new default,
      so we have to mark the previous one as not default.

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Laurent Vivier <[email protected]>
Signed-off-by: Eduardo Habkost <[email protected]>
  • Loading branch information
philmd authored and ehabkost committed Feb 28, 2020
1 parent 64bc77e commit abcbc4e
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion hw/lm32/lm32_boards.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ static void lm32_uclinux_class_init(ObjectClass *oc, void *data)

mc->desc = "lm32 platform for uClinux and u-boot by Theobroma Systems";
mc->init = lm32_uclinux_init;
mc->is_default = 0;
mc->default_cpu_type = LM32_CPU_TYPE_NAME("lm32-full");
mc->default_ram_size = 64 * MiB;
mc->default_ram_id = "lm32_uclinux.sdram";
Expand Down
1 change: 0 additions & 1 deletion hw/lm32/milkymist.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ static void milkymist_machine_init(MachineClass *mc)
{
mc->desc = "Milkymist One";
mc->init = milkymist_init;
mc->is_default = 0;
mc->default_cpu_type = LM32_CPU_TYPE_NAME("lm32-full");
mc->default_ram_size = 128 * MiB;
mc->default_ram_id = "milkymist.sdram";
Expand Down
1 change: 0 additions & 1 deletion hw/m68k/q800.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,6 @@ static void q800_machine_class_init(ObjectClass *oc, void *data)
mc->init = q800_init;
mc->default_cpu_type = M68K_CPU_TYPE_NAME("m68040");
mc->max_cpus = 1;
mc->is_default = 0;
mc->block_default_type = IF_SCSI;
mc->default_ram_id = "m68k_mac.ram";
}
Expand Down
1 change: 0 additions & 1 deletion hw/microblaze/petalogix_ml605_mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ static void petalogix_ml605_machine_init(MachineClass *mc)
{
mc->desc = "PetaLogix linux refdesign for xilinx ml605 little endian";
mc->init = petalogix_ml605_init;
mc->is_default = 0;
}

DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init)
1 change: 0 additions & 1 deletion hw/tricore/tricore_testboard.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ static void ttb_machine_init(MachineClass *mc)
{
mc->desc = "a minimal TriCore board";
mc->init = tricoreboard_init;
mc->is_default = 0;
mc->default_cpu_type = TRICORE_CPU_TYPE_NAME("tc1796");
}

Expand Down

0 comments on commit abcbc4e

Please sign in to comment.