Commit df47ce8a authored by Haozhong Zhang's avatar Haozhong Zhang Committed by Eduardo Habkost
Browse files

pc: add 2.12 machine types 



Signed-off-by: default avatarHaozhong Zhang <haozhong.zhang@intel.com>
Message-Id: <20171219033730.12748-2-haozhong.zhang@intel.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 8e5dc9ba

hw/i386/pc_piix.c

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

}



static void pc_i440fx_2_11_machine_options(MachineClass *m)

static void pc_i440fx_2_12_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

}



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);

}



DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,

                      pc_i440fx_2_11_machine_options);



static void pc_i440fx_2_10_machine_options(MachineClass *m)

{

    pc_i440fx_2_11_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);

    m->auto_enable_numa_with_memhp = false;

}

hw/i386/pc_q35.c

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

}



static void pc_q35_2_11_machine_options(MachineClass *m)

static void pc_q35_2_12_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



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

                   pc_q35_2_12_machine_options);



static void pc_q35_2_11_machine_options(MachineClass *m)

{

    pc_q35_2_12_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_11);

}



DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,

                   pc_q35_2_11_machine_options);



static void pc_q35_2_10_machine_options(MachineClass *m)

{

    pc_q35_2_11_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);

    m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;

    m->auto_enable_numa_with_memhp = false;

include/hw/i386/pc.h

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

    HW_COMPAT_2_11 \



#define PC_COMPAT_2_10 \

    HW_COMPAT_2_10 \

    {\