On 30/11/15 15:56, Eduardo Habkost wrote: > Remove the redundant 'alias = NULL' and 'is_default = 0' lines > from older machine-types. pc_*_2_4_machine_options() already > clear those fields, so they don't need to be cleared by > pc_*_2_3_machine_options(). > > Reviewed-by: Marcel Apfelbaum <[email protected]> > Signed-off-by: Eduardo Habkost <[email protected]> > --- > hw/i386/pc_piix.c | 2 -- > hw/i386/pc_q35.c | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 2e41efe..1a4ff01 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -499,8 +499,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) > { > pc_i440fx_2_4_machine_options(m); > m->hw_version = "2.3.0"; > - m->alias = NULL; > - m->is_default = 0; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); > } > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 133bc68..f17acca 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -399,7 +399,6 @@ static void pc_q35_2_3_machine_options(MachineClass *m) > m->hw_version = "2.3.0"; > m->no_floppy = 0; > m->no_tco = 1; > - m->alias = NULL; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); > }
Reviewed-by: Thomas Huth <[email protected]>
