From: Eduardo Habkost Date: Fri, 11 Sep 2015 20:14:24 +0000 (-0300) Subject: q35: Move options common to all classes to pc_i440fx_machine_options() X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~165^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=254bdb1cbfd467ff9897c75a28a472e4381ce4cf;p=sdk%2Femulator%2Fqemu.git q35: Move options common to all classes to pc_i440fx_machine_options() 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. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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; }