Commit 1c30044e authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros 



Use static arrays instead.  I decided to rename the conflicting
pc_compat_2_2() function with pc_compat_2_2_fn().

Suggested-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 8995dd90

hw/core/machine.c

+3 −0
Original line number Diff line number Diff line
@@ -306,6 +306,9 @@ GlobalProperty hw_compat_2_3[] = { 
};

const size_t hw_compat_2_3_len = G_N_ELEMENTS(hw_compat_2_3);



GlobalProperty hw_compat_2_2[] = {};

const size_t hw_compat_2_2_len = G_N_ELEMENTS(hw_compat_2_2);



static char *machine_get_accel(Object *obj, Error **errp)

{

    MachineState *ms = MACHINE(obj);

hw/i386/pc.c

+95 −0
Original line number Diff line number Diff line
@@ -441,6 +441,101 @@ GlobalProperty pc_compat_2_3[] = { 
};

const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3);



GlobalProperty pc_compat_2_2[] = {

    PC_CPU_MODEL_IDS("2.2.0")

    {

        .driver = "kvm64" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "kvm32" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Conroe" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Penryn" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Nehalem" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Westmere" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "SandyBridge" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Haswell" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Broadwell" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Opteron_G1" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Opteron_G2" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Opteron_G3" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Opteron_G4" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Opteron_G5" "-" TYPE_X86_CPU,

        .property = "vme",

        .value = "off",

    },

    {

        .driver = "Haswell" "-" TYPE_X86_CPU,

        .property = "f16c",

        .value = "off",

    },

    {

        .driver = "Haswell" "-" TYPE_X86_CPU,

        .property = "rdrand",

        .value = "off",

    },

    {

        .driver = "Broadwell" "-" TYPE_X86_CPU,

        .property = "f16c",

        .value = "off",

    },

    {

        .driver = "Broadwell" "-" TYPE_X86_CPU,

        .property = "rdrand",

        .value = "off",

    },

};

const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2);



void gsi_handler(void *opaque, int n, int level)

{

    GSIState *s = opaque;

hw/i386/pc_piix.c

+5 −7
Original line number Diff line number Diff line
@@ -318,14 +318,14 @@ static void pc_compat_2_3_fn(MachineState *machine) 
    }

}



static void pc_compat_2_2(MachineState *machine)

static void pc_compat_2_2_fn(MachineState *machine)

{

    pc_compat_2_3_fn(machine);

}



static void pc_compat_2_1(MachineState *machine)

{

    pc_compat_2_2(machine);

    pc_compat_2_2_fn(machine);

    x86_cpu_change_kvm_default("svm", NULL);

}
@@ -578,18 +578,16 @@ DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn, 
static void pc_i440fx_2_2_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    static GlobalProperty compat[] = {

        PC_COMPAT_2_2

    };



    pc_i440fx_2_3_machine_options(m);

    m->hw_version = "2.2.0";

    m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on";

    compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));

    compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len);

    compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len);

    pcmc->rsdp_in_ram = false;

}



DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2,

DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn,

                      pc_i440fx_2_2_machine_options);



static void pc_i440fx_2_1_machine_options(MachineClass *m)

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -4341,7 +4341,6 @@ DEFINE_SPAPR_MACHINE(2_3, "2.3", false); 
static void spapr_machine_2_2_class_options(MachineClass *mc)

{

    static GlobalProperty compat[] = {

        HW_COMPAT_2_2

        {

            .driver   = TYPE_SPAPR_PCI_HOST_BRIDGE,

            .property = "mem_win_size",
@@ -4350,6 +4349,7 @@ static void spapr_machine_2_2_class_options(MachineClass *mc) 
    };



    spapr_machine_2_3_class_options(mc);

    compat_props_add(mc->compat_props, hw_compat_2_2, hw_compat_2_2_len);

    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));

    mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on";

}

include/hw/boards.h

+3 −0
Original line number Diff line number Diff line
@@ -324,4 +324,7 @@ extern const size_t hw_compat_2_4_len; 
extern GlobalProperty hw_compat_2_3[];

extern const size_t hw_compat_2_3_len;



extern GlobalProperty hw_compat_2_2[];

extern const size_t hw_compat_2_2_len;



#endif