Commit 9aec2e52 authored by Cornelia Huck's avatar Cornelia Huck Committed by David Gibson
Browse files

hw: add compat machines for 4.2 



Add 4.2 machine types for arm/i440fx/q35/s390x/spapr.

For i440fx and q35, unversioned cpu models are still translated
to -v1, as 0788a56b ("i386: Make unversioned CPU models be
aliases") states this should only transition to the latest cpu
model version in 4.3 (or later).

Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20190724103524.20916-1-cohuck@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent a14f04eb

hw/arm/virt.c

+8 −1
Original line number Diff line number Diff line
@@ -2050,10 +2050,17 @@ static void machvirt_machine_init(void) 
}

type_init(machvirt_machine_init);



static void virt_machine_4_2_options(MachineClass *mc)

{

}

DEFINE_VIRT_MACHINE_AS_LATEST(4, 2)



static void virt_machine_4_1_options(MachineClass *mc)

{

    virt_machine_4_2_options(mc);

    compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len);

}

DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)

DEFINE_VIRT_MACHINE(4, 1)



static void virt_machine_4_0_options(MachineClass *mc)

{

hw/core/machine.c

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
#include "hw/pci/pci.h"

#include "hw/mem/nvdimm.h"



GlobalProperty hw_compat_4_1[] = {};

const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1);



GlobalProperty hw_compat_4_0[] = {

    { "VGA",            "edid", "false" },

    { "secondary-vga",  "edid", "false" },

hw/i386/pc.c

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; 
/* Physical Address of PVH entry point read from kernel ELF NOTE */

static size_t pvh_start_addr;



GlobalProperty pc_compat_4_1[] = {};

const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1);



GlobalProperty pc_compat_4_0[] = {};

const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);

hw/i386/pc_piix.c

+13 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static void pc_i440fx_machine_options(MachineClass *m) 
    machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);

}



static void pc_i440fx_4_1_machine_options(MachineClass *m)

static void pc_i440fx_4_2_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_machine_options(m);
@@ -441,6 +441,18 @@ static void pc_i440fx_4_1_machine_options(MachineClass *m) 
    pcmc->default_cpu_version = 1;

}



DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL,

                      pc_i440fx_4_2_machine_options);



static void pc_i440fx_4_1_machine_options(MachineClass *m)

{

    pc_i440fx_4_2_machine_options(m);

    m->alias = NULL;

    m->is_default = 0;

    compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len);

    compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len);

}



DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL,

                      pc_i440fx_4_1_machine_options);

hw/i386/pc_q35.c

+12 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static void pc_q35_machine_options(MachineClass *m) 
    m->max_cpus = 288;

}



static void pc_q35_4_1_machine_options(MachineClass *m)

static void pc_q35_4_2_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_q35_machine_options(m);
@@ -372,6 +372,17 @@ static void pc_q35_4_1_machine_options(MachineClass *m) 
    pcmc->default_cpu_version = 1;

}



DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL,

                   pc_q35_4_2_machine_options);



static void pc_q35_4_1_machine_options(MachineClass *m)

{

    pc_q35_4_2_machine_options(m);

    m->alias = NULL;

    compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len);

    compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len);

}



DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL,

                   pc_q35_4_1_machine_options);