Commit d86c1451 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

pc: Add 2.7 machine 



Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent f6f949e9

hw/i386/pc_piix.c

+13 −3
Original line number Diff line number Diff line
@@ -432,13 +432,25 @@ static void pc_i440fx_machine_options(MachineClass *m) 
    m->default_display = "std";

}



static void pc_i440fx_2_6_machine_options(MachineClass *m)

static void pc_i440fx_2_7_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

}



DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL,

                      pc_i440fx_2_7_machine_options);





static void pc_i440fx_2_6_machine_options(MachineClass *m)

{

    pc_i440fx_2_7_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);

}



DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,

                      pc_i440fx_2_6_machine_options);
@@ -447,8 +459,6 @@ static void pc_i440fx_2_5_machine_options(MachineClass *m) 
{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_2_6_machine_options(m);

    m->alias = NULL;

    m->is_default = 0;

    pcmc->save_tsc_khz = false;

    m->legacy_fw_cfg_order = 1;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);

hw/i386/pc_q35.c

+11 −2
Original line number Diff line number Diff line
@@ -283,12 +283,22 @@ static void pc_q35_machine_options(MachineClass *m) 
    m->no_floppy = 1;

}



static void pc_q35_2_6_machine_options(MachineClass *m)

static void pc_q35_2_7_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,

                   pc_q35_2_7_machine_options);



static void pc_q35_2_6_machine_options(MachineClass *m)

{

    pc_q35_2_7_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);

}



DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,

                   pc_q35_2_6_machine_options);
@@ -296,7 +306,6 @@ static void pc_q35_2_5_machine_options(MachineClass *m) 
{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_q35_2_6_machine_options(m);

    m->alias = NULL;

    pcmc->save_tsc_khz = false;

    m->legacy_fw_cfg_order = 1;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);

include/hw/i386/pc.h

+4 −0
Original line number Diff line number Diff line
@@ -356,7 +356,11 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); 
int e820_get_num_entries(void);

bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);



#define PC_COMPAT_2_6 \

    HW_COMPAT_2_6



#define PC_COMPAT_2_5 \

    PC_COMPAT_2_6 \

    HW_COMPAT_2_5



/* Helper for setting model-id for CPU models that changed model-id