Commit 0b7783a7 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 1f8828ef

hw/i386/pc_q35.c

+4 −4
Original line number Diff line number Diff line
@@ -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";

}