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

compat: replace PC_COMPAT_2_1 & HW_COMPAT_2_1 macros 



Use static arrays instead.  I decided to rename the conflicting
pc_compat_2_1() function with pc_compat_2_1_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 1c30044e

hw/core/machine.c

+33 −0
Original line number Diff line number Diff line
@@ -309,6 +309,39 @@ 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);



GlobalProperty hw_compat_2_1[] = {

    {

        .driver   = "intel-hda",

        .property = "old_msi_addr",

        .value    = "on",

    },{

        .driver   = "VGA",

        .property = "qemu-extended-regs",

        .value    = "off",

    },{

        .driver   = "secondary-vga",

        .property = "qemu-extended-regs",

        .value    = "off",

    },{

        .driver   = "virtio-scsi-pci",

        .property = "any_layout",

        .value    = "off",

    },{

        .driver   = "usb-mouse",

        .property = "usb_version",

        .value    = stringify(1),

    },{

        .driver   = "usb-kbd",

        .property = "usb_version",

        .value    = stringify(1),

    },{

        .driver   = "virtio-pci",

        .property = "virtio-pci-bus-master-bug-migration",

        .value    = "on",

    },

};

const size_t hw_compat_2_1_len = G_N_ELEMENTS(hw_compat_2_1);



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

{

    MachineState *ms = MACHINE(obj);

hw/i386/pc.c

+15 −0
Original line number Diff line number Diff line
@@ -536,6 +536,21 @@ GlobalProperty pc_compat_2_2[] = { 
};

const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2);



GlobalProperty pc_compat_2_1[] = {

    PC_CPU_MODEL_IDS("2.1.0")

    {

        .driver = "coreduo" "-" TYPE_X86_CPU,

        .property = "vmx",

        .value = "on",

    },

    {

        .driver = "core2duo" "-" TYPE_X86_CPU,

        .property = "vmx",

        .value = "on",

    },

};

const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1);



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
@@ -323,7 +323,7 @@ static void pc_compat_2_2_fn(MachineState *machine) 
    pc_compat_2_3_fn(machine);

}



static void pc_compat_2_1(MachineState *machine)

static void pc_compat_2_1_fn(MachineState *machine)

{

    pc_compat_2_2_fn(machine);

    x86_cpu_change_kvm_default("svm", NULL);
@@ -331,7 +331,7 @@ static void pc_compat_2_1(MachineState *machine) 


static void pc_compat_2_0(MachineState *machine)

{

    pc_compat_2_1(machine);

    pc_compat_2_1_fn(machine);

}



static void pc_compat_1_7(MachineState *machine)
@@ -593,19 +593,17 @@ DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn, 
static void pc_i440fx_2_1_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    static GlobalProperty compat[] = {

        PC_COMPAT_2_1

    };



    pc_i440fx_2_2_machine_options(m);

    m->hw_version = "2.1.0";

    m->default_display = NULL;

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

    compat_props_add(m->compat_props, hw_compat_2_1, hw_compat_2_1_len);

    compat_props_add(m->compat_props, pc_compat_2_1, pc_compat_2_1_len);

    pcmc->smbios_uuid_encoded = false;

    pcmc->enforce_aligned_dimm = false;

}



DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1,

DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1_fn,

                      pc_i440fx_2_1_machine_options);



static void pc_i440fx_2_0_machine_options(MachineClass *m)

hw/ppc/spapr.c

+1 −5
Original line number Diff line number Diff line
@@ -4361,12 +4361,8 @@ DEFINE_SPAPR_MACHINE(2_2, "2.2", false); 


static void spapr_machine_2_1_class_options(MachineClass *mc)

{

    static GlobalProperty compat[] = {

        HW_COMPAT_2_1

    };



    spapr_machine_2_2_class_options(mc);

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

    compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len);

}

DEFINE_SPAPR_MACHINE(2_1, "2.1", false);

include/hw/boards.h

+3 −0
Original line number Diff line number Diff line
@@ -327,4 +327,7 @@ extern const size_t hw_compat_2_3_len; 
extern GlobalProperty hw_compat_2_2[];

extern const size_t hw_compat_2_2_len;



extern GlobalProperty hw_compat_2_1[];

extern const size_t hw_compat_2_1_len;



#endif