[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 2/3] q35: Move options common to all classes
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH v2 2/3] q35: Move options common to all classes to pc_i440fx_machine_options() |
Date: |
Mon, 14 Sep 2015 15:36:10 +0200 |
On Fri, 11 Sep 2015 17:14:24 -0300
Eduardo Habkost <address@hidden> wrote:
> The existing default_machine_opts and default_display settings will
> still apply to future machine classes. So it makes sense to move them to
> pc_i440fx_machine_options() instead of keeping them in a
> version-specific machine_options function.
s/q35/piix/ or something like this, with this:
Reviewed-by: Igor Mammedov <address@hidden>
>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
> hw/i386/pc_piix.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 3f925b2..2d9df7c 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -460,6 +460,8 @@ static void pc_i440fx_machine_options(MachineClass *m)
> m->family = "pc_piix";
> m->desc = "Standard PC (i440FX + PIIX, 1996)";
> m->hot_add_cpu = pc_hot_add_cpu;
> + m->default_machine_opts = "firmware=bios-256k.bin";
> + m->default_display = "std";
> }
>
> static void pc_i440fx_2_4_machine_options(MachineClass *m)
> @@ -467,8 +469,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
> PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> pc_i440fx_machine_options(m);
> pcmc->broken_reserved_end = true;
> - m->default_machine_opts = "firmware=bios-256k.bin";
> - m->default_display = "std";
> m->alias = "pc";
> m->is_default = 1;
> }