hw: Add compat machines for 8.1
Add 8.1 machine types for arm/i440fx/m68k/q35/s390x/spapr. Signed-off-by: Cornelia Huck <cohuck@redhat.com> Message-Id: <20230314173009.152667-1-cohuck@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Acked-by: Gavin Shan <gshan@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
c1eb2ddf0f
commit
f9be4771d3
|
@ -3232,10 +3232,17 @@ static void machvirt_machine_init(void)
|
|||
}
|
||||
type_init(machvirt_machine_init);
|
||||
|
||||
static void virt_machine_8_0_options(MachineClass *mc)
|
||||
static void virt_machine_8_1_options(MachineClass *mc)
|
||||
{
|
||||
}
|
||||
DEFINE_VIRT_MACHINE_AS_LATEST(8, 0)
|
||||
DEFINE_VIRT_MACHINE_AS_LATEST(8, 1)
|
||||
|
||||
static void virt_machine_8_0_options(MachineClass *mc)
|
||||
{
|
||||
virt_machine_8_1_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_8_0, hw_compat_8_0_len);
|
||||
}
|
||||
DEFINE_VIRT_MACHINE(8, 0)
|
||||
|
||||
static void virt_machine_7_2_options(MachineClass *mc)
|
||||
{
|
||||
|
|
|
@ -39,6 +39,9 @@
|
|||
#include "hw/virtio/virtio.h"
|
||||
#include "hw/virtio/virtio-pci.h"
|
||||
|
||||
GlobalProperty hw_compat_8_0[] = {};
|
||||
const size_t hw_compat_8_0_len = G_N_ELEMENTS(hw_compat_8_0);
|
||||
|
||||
GlobalProperty hw_compat_7_2[] = {
|
||||
{ "e1000e", "migrate-timadj", "off" },
|
||||
{ "virtio-mem", "x-early-migration", "false" },
|
||||
|
|
|
@ -116,6 +116,9 @@
|
|||
{ "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
|
||||
{ "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
|
||||
|
||||
GlobalProperty pc_compat_8_0[] = {};
|
||||
const size_t pc_compat_8_0_len = G_N_ELEMENTS(pc_compat_8_0);
|
||||
|
||||
GlobalProperty pc_compat_7_2[] = {
|
||||
{ "ICH9-LPC", "noreboot", "true" },
|
||||
};
|
||||
|
|
|
@ -454,21 +454,31 @@ static void pc_i440fx_machine_options(MachineClass *m)
|
|||
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
|
||||
}
|
||||
|
||||
static void pc_i440fx_8_0_machine_options(MachineClass *m)
|
||||
static void pc_i440fx_8_1_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_machine_options(m);
|
||||
m->alias = "pc";
|
||||
m->is_default = true;
|
||||
}
|
||||
|
||||
DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL,
|
||||
pc_i440fx_8_1_machine_options);
|
||||
|
||||
static void pc_i440fx_8_0_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_8_1_machine_options(m);
|
||||
m->alias = NULL;
|
||||
m->is_default = false;
|
||||
compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len);
|
||||
compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len);
|
||||
}
|
||||
|
||||
DEFINE_I440FX_MACHINE(v8_0, "pc-i440fx-8.0", NULL,
|
||||
pc_i440fx_8_0_machine_options);
|
||||
|
||||
static void pc_i440fx_7_2_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_i440fx_8_0_machine_options(m);
|
||||
m->alias = NULL;
|
||||
m->is_default = false;
|
||||
compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
|
||||
compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
|
||||
}
|
||||
|
|
|
@ -373,19 +373,29 @@ static void pc_q35_machine_options(MachineClass *m)
|
|||
m->max_cpus = 288;
|
||||
}
|
||||
|
||||
static void pc_q35_8_0_machine_options(MachineClass *m)
|
||||
static void pc_q35_8_1_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_machine_options(m);
|
||||
m->alias = "q35";
|
||||
}
|
||||
|
||||
DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL,
|
||||
pc_q35_8_1_machine_options);
|
||||
|
||||
static void pc_q35_8_0_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_8_1_machine_options(m);
|
||||
m->alias = NULL;
|
||||
compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len);
|
||||
compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len);
|
||||
}
|
||||
|
||||
DEFINE_Q35_MACHINE(v8_0, "pc-q35-8.0", NULL,
|
||||
pc_q35_8_0_machine_options);
|
||||
|
||||
static void pc_q35_7_2_machine_options(MachineClass *m)
|
||||
{
|
||||
pc_q35_8_0_machine_options(m);
|
||||
m->alias = NULL;
|
||||
compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
|
||||
compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
|
||||
}
|
||||
|
|
|
@ -347,10 +347,17 @@ type_init(virt_machine_register_types)
|
|||
} \
|
||||
type_init(machvirt_machine_##major##_##minor##_init);
|
||||
|
||||
static void virt_machine_8_0_options(MachineClass *mc)
|
||||
static void virt_machine_8_1_options(MachineClass *mc)
|
||||
{
|
||||
}
|
||||
DEFINE_VIRT_MACHINE(8, 0, true)
|
||||
DEFINE_VIRT_MACHINE(8, 1, true)
|
||||
|
||||
static void virt_machine_8_0_options(MachineClass *mc)
|
||||
{
|
||||
virt_machine_8_1_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_8_0, hw_compat_8_0_len);
|
||||
}
|
||||
DEFINE_VIRT_MACHINE(8, 0, false)
|
||||
|
||||
static void virt_machine_7_2_options(MachineClass *mc)
|
||||
{
|
||||
|
|
|
@ -4735,14 +4735,25 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
|
|||
type_init(spapr_machine_register_##suffix)
|
||||
|
||||
/*
|
||||
* pseries-8.0
|
||||
* pseries-8.1
|
||||
*/
|
||||
static void spapr_machine_8_0_class_options(MachineClass *mc)
|
||||
static void spapr_machine_8_1_class_options(MachineClass *mc)
|
||||
{
|
||||
/* Defaults for the latest behaviour inherited from the base class */
|
||||
}
|
||||
|
||||
DEFINE_SPAPR_MACHINE(8_0, "8.0", true);
|
||||
DEFINE_SPAPR_MACHINE(8_1, "8.1", true);
|
||||
|
||||
/*
|
||||
* pseries-8.0
|
||||
*/
|
||||
static void spapr_machine_8_0_class_options(MachineClass *mc)
|
||||
{
|
||||
spapr_machine_8_1_class_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_8_0, hw_compat_8_0_len);
|
||||
}
|
||||
|
||||
DEFINE_SPAPR_MACHINE(8_0, "8.0", false);
|
||||
|
||||
/*
|
||||
* pseries-7.2
|
||||
|
|
|
@ -826,14 +826,26 @@ bool css_migration_enabled(void)
|
|||
} \
|
||||
type_init(ccw_machine_register_##suffix)
|
||||
|
||||
static void ccw_machine_8_1_instance_options(MachineState *machine)
|
||||
{
|
||||
}
|
||||
|
||||
static void ccw_machine_8_1_class_options(MachineClass *mc)
|
||||
{
|
||||
}
|
||||
DEFINE_CCW_MACHINE(8_1, "8.1", true);
|
||||
|
||||
static void ccw_machine_8_0_instance_options(MachineState *machine)
|
||||
{
|
||||
ccw_machine_8_1_instance_options(machine);
|
||||
}
|
||||
|
||||
static void ccw_machine_8_0_class_options(MachineClass *mc)
|
||||
{
|
||||
ccw_machine_8_1_class_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_8_0, hw_compat_8_0_len);
|
||||
}
|
||||
DEFINE_CCW_MACHINE(8_0, "8.0", true);
|
||||
DEFINE_CCW_MACHINE(8_0, "8.0", false);
|
||||
|
||||
static void ccw_machine_7_2_instance_options(MachineState *machine)
|
||||
{
|
||||
|
|
|
@ -381,6 +381,9 @@ struct MachineState {
|
|||
} \
|
||||
type_init(machine_initfn##_register_types)
|
||||
|
||||
extern GlobalProperty hw_compat_8_0[];
|
||||
extern const size_t hw_compat_8_0_len;
|
||||
|
||||
extern GlobalProperty hw_compat_7_2[];
|
||||
extern const size_t hw_compat_7_2_len;
|
||||
|
||||
|
|
|
@ -195,6 +195,9 @@ void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids,
|
|||
/* sgx.c */
|
||||
void pc_machine_init_sgx_epc(PCMachineState *pcms);
|
||||
|
||||
extern GlobalProperty pc_compat_8_0[];
|
||||
extern const size_t pc_compat_8_0_len;
|
||||
|
||||
extern GlobalProperty pc_compat_7_2[];
|
||||
extern const size_t pc_compat_7_2_len;
|
||||
|
||||
|
|
Loading…
Reference in New Issue