Commit 968ee4ad authored by Babu Moger's avatar Babu Moger Committed by Eduardo Habkost
Browse files

pc: add 2.13 machine types 



Add pc-q35-2.13 and pc-i440fx-2.13 machine types

Signed-off-by: default avatarBabu Moger <babu.moger@amd.com>
Message-Id: <20180514164156.27034-2-babu.moger@amd.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent fe52acd2

hw/i386/pc_piix.c

+12 −3
Original line number Diff line number Diff line
@@ -425,21 +425,30 @@ static void pc_i440fx_machine_options(MachineClass *m) 
    m->default_display = "std";

}



static void pc_i440fx_2_12_machine_options(MachineClass *m)

static void pc_i440fx_2_13_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

}



DEFINE_I440FX_MACHINE(v2_13, "pc-i440fx-2.13", NULL,

                      pc_i440fx_2_13_machine_options);



static void pc_i440fx_2_12_machine_options(MachineClass *m)

{

    pc_i440fx_2_13_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);

}



DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL,

                      pc_i440fx_2_12_machine_options);



static void pc_i440fx_2_11_machine_options(MachineClass *m)

{

    pc_i440fx_2_12_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_11);

}

hw/i386/pc_q35.c

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

}



static void pc_q35_2_12_machine_options(MachineClass *m)

static void pc_q35_2_13_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



DEFINE_Q35_MACHINE(v2_13, "pc-q35-2.13", NULL,

                    pc_q35_2_13_machine_options);



static void pc_q35_2_12_machine_options(MachineClass *m)

{

    pc_q35_2_13_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);

}



DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL,

                   pc_q35_2_12_machine_options);
@@ -323,7 +333,6 @@ static void pc_q35_2_11_machine_options(MachineClass *m) 


    pc_q35_2_12_machine_options(m);

    pcmc->default_nic_model = "e1000";

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_11);

}

include/hw/i386/pc.h

+3 −0
Original line number Diff line number Diff line
@@ -296,6 +296,9 @@ 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_12 \

    HW_COMPAT_2_12 \



#define PC_COMPAT_2_11 \

    HW_COMPAT_2_11 \

    {\