Re: [Qemu-devel] [PATCH v2 1/3] q35: Move options common to all classes to pc_q35_machine_options()

[Igor Mammedov]

On Fri, 11 Sep 2015 17:14:23 -0300
Eduardo Habkost <address@hidden> wrote:

> The existing default_machine_opts, default_display, no_floppy, and
> no_tco settings will still apply to future machine classes. So it makes
> sense to move them to pc_q35_machine_options() instead of keeping them
> in a version-specific machine_options function.
> 
> Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>

> ---
>  hw/i386/pc_q35.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 11601ab..966eedb 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -364,6 +364,10 @@ static void pc_q35_machine_options(MachineClass *m)
>      m->desc = "Standard PC (Q35 + ICH9, 2009)";
>      m->hot_add_cpu = pc_hot_add_cpu;
>      m->units_per_default_bus = 1;
> +    m->default_machine_opts = "firmware=bios-256k.bin";
> +    m->default_display = "std";
> +    m->no_floppy = 1;
> +    m->no_tco = 0;
>  }
>  
>  static void pc_q35_2_4_machine_options(MachineClass *m)
> @@ -371,10 +375,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m)
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
>      pc_q35_machine_options(m);
>      pcmc->broken_reserved_end = true;
> -    m->default_machine_opts = "firmware=bios-256k.bin";
> -    m->default_display = "std";
> -    m->no_floppy = 1;
> -    m->no_tco = 0;
>      m->alias = "q35";
>  }
>