Commit 9bf2650b authored by Cornelia Huck's avatar Cornelia Huck Committed by Eduardo Habkost
Browse files

hw: add compat machines for 4.1 



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

Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20190411102025.22559-1-cohuck@redhat.com>
Acked-by: default avatarGreg Kurz <groug@kaod.org>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 3284aa12

hw/arm/virt.c

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

type_init(machvirt_machine_init);



static void virt_machine_4_1_options(MachineClass *mc)

{

}

DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)



static void virt_machine_4_0_options(MachineClass *mc)

{

    virt_machine_4_1_options(mc);

    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);

}

DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)

DEFINE_VIRT_MACHINE(4, 0)



static void virt_machine_3_1_options(MachineClass *mc)

{

hw/core/machine.c

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

#include "hw/mem/nvdimm.h"



GlobalProperty hw_compat_4_0[] = {};

const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);



GlobalProperty hw_compat_3_1[] = {

    { "pcie-root-port", "x-speed", "2_5" },

    { "pcie-root-port", "x-width", "1" },

hw/i386/pc.c

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,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_0[] = {};

const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);



GlobalProperty pc_compat_3_1[] = {

    { "intel-iommu", "dma-drain", "off" },

    { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },

hw/i386/pc_piix.c

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

}



static void pc_i440fx_4_0_machine_options(MachineClass *m)

static void pc_i440fx_4_1_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

}



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

                      pc_i440fx_4_1_machine_options);



static void pc_i440fx_4_0_machine_options(MachineClass *m)

{

    pc_i440fx_4_1_machine_options(m);

    m->alias = NULL;

    m->is_default = 0;

    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);

    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);

}



DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,

                      pc_i440fx_4_0_machine_options);

hw/i386/pc_q35.c

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

}



static void pc_q35_4_0_machine_options(MachineClass *m)

static void pc_q35_4_1_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



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

                   pc_q35_4_1_machine_options);



static void pc_q35_4_0_machine_options(MachineClass *m)

{

    pc_q35_4_1_machine_options(m);

    m->alias = NULL;

    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);

    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);

}



DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,

                   pc_q35_4_0_machine_options);