Commit 254bdb1c authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

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: 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 0b7783a7

hw/i386/pc_piix.c

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

}