diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-09-11 17:14:24 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-09-24 13:39:47 +0300 |
| commit | 254bdb1cbfd467ff9897c75a28a472e4381ce4cf (patch) | |
| tree | abba203ea31d5dcfc86f0ee1aa5f5cd3b5823901 /hw/i386/pc_piix.c | |
| parent | 0b7783a79ef73a06f3a67b68e72d109afe975b77 (diff) | |
| download | qemu-254bdb1cbfd467ff9897c75a28a472e4381ce4cf.tar.gz qemu-254bdb1cbfd467ff9897c75a28a472e4381ce4cf.tar.bz2 qemu-254bdb1cbfd467ff9897c75a28a472e4381ce4cf.zip | |
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 <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3f925b26db..2d9df7c117 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; } |