diff options
| author | Eduardo Habkost | 2015-09-11 22:14:23 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-09-24 12:39:47 +0200 |
| commit | 0b7783a79ef73a06f3a67b68e72d109afe975b77 (patch) | |
| tree | 09a34b9ca3239ec6647311b30972b889a0b310af /hw/i386 | |
| parent | virtio-net: unbreak self announcement and guest offloads after migration (diff) | |
| download | qemu-0b7783a79ef73a06f3a67b68e72d109afe975b77.tar.gz qemu-0b7783a79ef73a06f3a67b68e72d109afe975b77.tar.xz qemu-0b7783a79ef73a06f3a67b68e72d109afe975b77.zip | |
q35: Move options common to all classes to pc_q35_machine_options()
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 <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')
| -rw-r--r-- | hw/i386/pc_q35.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 11601ab005..966eedb91f 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"; } |