hw: add compat machines for 6.1
Add 6.1 machine types for arm/i440fx/q35/s390x/spapr. Signed-off-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Greg Kurz <groug@kaod.org> Message-id: 20210331111900.118274-1-cohuck@redhat.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
0ca0f8720a
commit
da7e13c00b
|
@ -2757,10 +2757,15 @@ static void machvirt_machine_init(void)
|
|||
}
|
||||
type_init(machvirt_machine_init);
|
||||
|
||||
static void virt_machine_6_1_options(MachineClass *mc)
|
||||
{
|
||||
}
|
||||
DEFINE_VIRT_MACHINE_AS_LATEST(6, 1)
|
||||
|
||||
static void virt_machine_6_0_options(MachineClass *mc)
|
||||
{
|
||||
}
|
||||
DEFINE_VIRT_MACHINE_AS_LATEST(6, 0)
|
||||
DEFINE_VIRT_MACHINE(6, 0)
|
||||
|
||||
static void virt_machine_5_2_options(MachineClass *mc)
|
||||
{
|
||||
|
|
|
@ -36,6 +36,9 @@
|
|||
#include "hw/virtio/virtio.h"
|
||||
#include "hw/virtio/virtio-pci.h"
|
||||
|
||||
GlobalProperty hw_compat_6_0[] = {};
|
||||
const size_t hw_compat_6_0_len = G_N_ELEMENTS(hw_compat_6_0);
|
||||
|
||||
GlobalProperty hw_compat_5_2[] = {
|
||||
{ "ICH9-LPC", "smm-compat", "on"},
|
||||
{ "PIIX4_PM", "smm-compat", "on"},
|
||||
|
|
|
@ -96,6 +96,9 @@
|
|||
#include "trace.h"
|
||||
#include CONFIG_DEVICES
|
||||
|
||||
GlobalProperty pc_compat_6_0[] = {};
|
||||
const size_t pc_compat_6_0_len = G_N_ELEMENTS(pc_compat_6_0);
|
||||
|
||||
GlobalProperty pc_compat_5_2[] = {
|
||||
{ "ICH9-LPC", "x-smi-cpu-hotunplug", "off" },
|
||||
};
|
||||
|
|
|
@ -415,7 +415,7 @@ static void pc_i440fx_machine_options(MachineClass *m)
|
|||
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
|
||||
}
|
||||
|
||||
static void pc_i440fx_6_0_machine_options(MachineClass *m)
|
||||
static void pc_i440fx_6_1_machine_options(MachineClass *m)
|
||||
{
|
||||
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
||||
pc_i440fx_machine_options(m);
|
||||
|
@ -424,6 +424,18 @@ static void pc_i440fx_6_0_machine_options(MachineClass *m)
|
|||
pcmc->default_cpu_version = 1;
|
||||
}
|
||||
|
||||
DEFINE_I440FX_MACHINE(v6_1, "pc-i440fx-6.1", NULL,
|
||||
pc_i440fx_6_1_machine_options);
|
||||
|
||||
static void pc_i440fx_6_0_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_6_1_machine_options(m);
|
||||
m->alias = NULL;
|
||||
m->is_default = false;
|
||||
compat_props_add(m->compat_props, hw_compat_6_0, hw_compat_6_0_len);
|
||||
compat_props_add(m->compat_props, pc_compat_6_0, pc_compat_6_0_len);
|
||||
}
|
||||
|
||||
DEFINE_I440FX_MACHINE(v6_0, "pc-i440fx-6.0", NULL,
|
||||
pc_i440fx_6_0_machine_options);
|
||||
|
||||
|
|
|
@ -345,7 +345,7 @@ static void pc_q35_machine_options(MachineClass *m)
|
|||
m->max_cpus = 288;
|
||||
}
|
||||
|
||||
static void pc_q35_6_0_machine_options(MachineClass *m)
|
||||
static void pc_q35_6_1_machine_options(MachineClass *m)
|
||||
{
|
||||
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
||||
pc_q35_machine_options(m);
|
||||
|
@ -353,6 +353,17 @@ static void pc_q35_6_0_machine_options(MachineClass *m)
|
|||
pcmc->default_cpu_version = 1;
|
||||
}
|
||||
|
||||
DEFINE_Q35_MACHINE(v6_1, "pc-q35-6.1", NULL,
|
||||
pc_q35_6_1_machine_options);
|
||||
|
||||
static void pc_q35_6_0_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_6_1_machine_options(m);
|
||||
m->alias = NULL;
|
||||
compat_props_add(m->compat_props, hw_compat_6_0, hw_compat_6_0_len);
|
||||
compat_props_add(m->compat_props, pc_compat_6_0, pc_compat_6_0_len);
|
||||
}
|
||||
|
||||
DEFINE_Q35_MACHINE(v6_0, "pc-q35-6.0", NULL,
|
||||
pc_q35_6_0_machine_options);
|
||||
|
||||
|
|
|
@ -4605,14 +4605,25 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
|
|||
type_init(spapr_machine_register_##suffix)
|
||||
|
||||
/*
|
||||
* pseries-6.0
|
||||
* pseries-6.1
|
||||
*/
|
||||
static void spapr_machine_6_0_class_options(MachineClass *mc)
|
||||
static void spapr_machine_6_1_class_options(MachineClass *mc)
|
||||
{
|
||||
/* Defaults for the latest behaviour inherited from the base class */
|
||||
}
|
||||
|
||||
DEFINE_SPAPR_MACHINE(6_0, "6.0", true);
|
||||
DEFINE_SPAPR_MACHINE(6_1, "6.1", true);
|
||||
|
||||
/*
|
||||
* pseries-6.0
|
||||
*/
|
||||
static void spapr_machine_6_0_class_options(MachineClass *mc)
|
||||
{
|
||||
spapr_machine_6_1_class_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len);
|
||||
}
|
||||
|
||||
DEFINE_SPAPR_MACHINE(6_0, "6.0", false);
|
||||
|
||||
/*
|
||||
* pseries-5.2
|
||||
|
|
|
@ -795,14 +795,26 @@ bool css_migration_enabled(void)
|
|||
} \
|
||||
type_init(ccw_machine_register_##suffix)
|
||||
|
||||
static void ccw_machine_6_1_instance_options(MachineState *machine)
|
||||
{
|
||||
}
|
||||
|
||||
static void ccw_machine_6_1_class_options(MachineClass *mc)
|
||||
{
|
||||
}
|
||||
DEFINE_CCW_MACHINE(6_1, "6.1", true);
|
||||
|
||||
static void ccw_machine_6_0_instance_options(MachineState *machine)
|
||||
{
|
||||
ccw_machine_6_1_instance_options(machine);
|
||||
}
|
||||
|
||||
static void ccw_machine_6_0_class_options(MachineClass *mc)
|
||||
{
|
||||
ccw_machine_6_1_class_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len);
|
||||
}
|
||||
DEFINE_CCW_MACHINE(6_0, "6.0", true);
|
||||
DEFINE_CCW_MACHINE(6_0, "6.0", false);
|
||||
|
||||
static void ccw_machine_5_2_instance_options(MachineState *machine)
|
||||
{
|
||||
|
|
|
@ -353,6 +353,9 @@ struct MachineState {
|
|||
} \
|
||||
type_init(machine_initfn##_register_types)
|
||||
|
||||
extern GlobalProperty hw_compat_6_0[];
|
||||
extern const size_t hw_compat_6_0_len;
|
||||
|
||||
extern GlobalProperty hw_compat_5_2[];
|
||||
extern const size_t hw_compat_5_2_len;
|
||||
|
||||
|
|
|
@ -197,6 +197,9 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data,
|
|||
void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
|
||||
const CPUArchIdList *apic_ids, GArray *entry);
|
||||
|
||||
extern GlobalProperty pc_compat_6_0[];
|
||||
extern const size_t pc_compat_6_0_len;
|
||||
|
||||
extern GlobalProperty pc_compat_5_2[];
|
||||
extern const size_t pc_compat_5_2_len;
|
||||
|
||||
|
|
Loading…
Reference in New Issue