Commit a4d3c834 authored by Longpeng(Mike)'s avatar Longpeng(Mike) Committed by Michael S. Tsirkin
Browse files

pc: Add 2.8 machine 



This will used by the next patch.

Signed-off-by: default avatarLongpeng(Mike) <longpeng2@huawei.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent e3aab6c7

hw/i386/pc_piix.c

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

}



static void pc_i440fx_2_7_machine_options(MachineClass *m)

static void pc_i440fx_2_8_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

}



DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,

                      pc_i440fx_2_8_machine_options);





static void pc_i440fx_2_7_machine_options(MachineClass *m)

{

    pc_i440fx_2_8_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);

}



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

                      pc_i440fx_2_7_machine_options);
@@ -452,8 +464,6 @@ static void pc_i440fx_2_6_machine_options(MachineClass *m) 
{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_2_7_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    pcmc->legacy_cpu_hotplug = true;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);

}

hw/i386/pc_q35.c

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

}



static void pc_q35_2_7_machine_options(MachineClass *m)

static void pc_q35_2_8_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,

                   pc_q35_2_8_machine_options);



static void pc_q35_2_7_machine_options(MachineClass *m)

{

    pc_q35_2_8_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);

}



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

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

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_q35_2_7_machine_options(m);

    m->alias = NULL;

    pcmc->legacy_cpu_hotplug = true;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);

}

include/hw/i386/pc.h

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

    HW_COMPAT_2_7



#define PC_COMPAT_2_6 \

    HW_COMPAT_2_6 \

    {\