hw/i386: Rename 2.13 machine types to 3.0
Rename the 2.13 machine types to match what we're going to use as our next release number. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-id: 20180522104000.9044-3-peter.maydell@linaro.org
This commit is contained in:
parent
51f63ec7da
commit
aa78a16d86
@ -425,19 +425,19 @@ static void pc_i440fx_machine_options(MachineClass *m)
|
||||
m->default_display = "std";
|
||||
}
|
||||
|
||||
static void pc_i440fx_2_13_machine_options(MachineClass *m)
|
||||
static void pc_i440fx_3_0_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_machine_options(m);
|
||||
m->alias = "pc";
|
||||
m->is_default = 1;
|
||||
}
|
||||
|
||||
DEFINE_I440FX_MACHINE(v2_13, "pc-i440fx-2.13", NULL,
|
||||
pc_i440fx_2_13_machine_options);
|
||||
DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
|
||||
pc_i440fx_3_0_machine_options);
|
||||
|
||||
static void pc_i440fx_2_12_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_2_13_machine_options(m);
|
||||
pc_i440fx_3_0_machine_options(m);
|
||||
m->is_default = 0;
|
||||
m->alias = NULL;
|
||||
SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
|
||||
|
@ -308,18 +308,18 @@ static void pc_q35_machine_options(MachineClass *m)
|
||||
m->max_cpus = 288;
|
||||
}
|
||||
|
||||
static void pc_q35_2_13_machine_options(MachineClass *m)
|
||||
static void pc_q35_3_0_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_machine_options(m);
|
||||
m->alias = "q35";
|
||||
}
|
||||
|
||||
DEFINE_Q35_MACHINE(v2_13, "pc-q35-2.13", NULL,
|
||||
pc_q35_2_13_machine_options);
|
||||
DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,
|
||||
pc_q35_3_0_machine_options);
|
||||
|
||||
static void pc_q35_2_12_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_2_13_machine_options(m);
|
||||
pc_q35_3_0_machine_options(m);
|
||||
m->alias = NULL;
|
||||
SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user