mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw: Add compat machines for 8.2

Browse Source 
Add 8.2 machine types for arm/i440fx/m68k/q35/s390x/spapr.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20230718142235.135319-1-cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Cornelia Huck 2023-07-18 16:22:35 +02:00 committed by Thomas Huth
parent b0dd9a7d6d
commit 95f5c89eca
10 changed files with 82 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/arm/virt.c
View File

@ -3170,10 +3170,17 @@ static void machvirt_machine_init(void)
} }
type_init(machvirt_machine_init); type_init(machvirt_machine_init);
static void virt_machine_8_1_options(MachineClass *mc) static void virt_machine_8_2_options(MachineClass *mc)
{ {
} }
DEFINE_VIRT_MACHINE_AS_LATEST(8, 1) DEFINE_VIRT_MACHINE_AS_LATEST(8, 2)
static void virt_machine_8_1_options(MachineClass *mc)
{
virt_machine_8_2_options(mc);
compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len);
}
DEFINE_VIRT_MACHINE(8, 1)
static void virt_machine_8_0_options(MachineClass *mc) static void virt_machine_8_0_options(MachineClass *mc)
{ {

3
hw/core/machine.c
View File

@ -39,6 +39,9 @@
#include "hw/virtio/virtio.h" #include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-pci.h"
GlobalProperty hw_compat_8_1[] = {};
const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1);
GlobalProperty hw_compat_8_0[] = { GlobalProperty hw_compat_8_0[] = {
{ "migration", "multifd-flush-after-each-section", "on"}, { "migration", "multifd-flush-after-each-section", "on"},
{ TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" }, { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" },

3
hw/i386/pc.c
View File

@ -114,6 +114,9 @@
{ "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
{ "athlon-" 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_1[] = {};
const size_t pc_compat_8_1_len = G_N_ELEMENTS(pc_compat_8_1);
GlobalProperty pc_compat_8_0[] = { GlobalProperty pc_compat_8_0[] = {
{ "virtio-mem", "unplugged-inaccessible", "auto" }, { "virtio-mem", "unplugged-inaccessible", "auto" },
}; };

16
hw/i386/pc_piix.c
View File

@ -504,13 +504,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
} }
static void pc_i440fx_8_1_machine_options(MachineClass *m) static void pc_i440fx_8_2_machine_options(MachineClass *m)
{ {
pc_i440fx_machine_options(m); pc_i440fx_machine_options(m);
m->alias = "pc"; m->alias = "pc";
m->is_default = true; m->is_default = true;
} }
DEFINE_I440FX_MACHINE(v8_2, "pc-i440fx-8.2", NULL,
pc_i440fx_8_2_machine_options);
static void pc_i440fx_8_1_machine_options(MachineClass *m)
{
pc_i440fx_8_2_machine_options(m);
m->alias = NULL;
m->is_default = false;
compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len);
compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len);
}
DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL, DEFINE_I440FX_MACHINE(v8_1, "pc-i440fx-8.1", NULL,
pc_i440fx_8_1_machine_options); pc_i440fx_8_1_machine_options);
@ -519,8 +531,6 @@ static void pc_i440fx_8_0_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_8_1_machine_options(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, hw_compat_8_0, hw_compat_8_0_len);
compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len);

14
hw/i386/pc_q35.c
View File

@ -379,12 +379,23 @@ static void pc_q35_machine_options(MachineClass *m)
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
} }
static void pc_q35_8_1_machine_options(MachineClass *m) static void pc_q35_8_2_machine_options(MachineClass *m)
{ {
pc_q35_machine_options(m); pc_q35_machine_options(m);
m->alias = "q35"; m->alias = "q35";
} }
DEFINE_Q35_MACHINE(v8_2, "pc-q35-8.2", NULL,
pc_q35_8_2_machine_options);
static void pc_q35_8_1_machine_options(MachineClass *m)
{
pc_q35_8_2_machine_options(m);
m->alias = NULL;
compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len);
compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len);
}
DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL, DEFINE_Q35_MACHINE(v8_1, "pc-q35-8.1", NULL,
pc_q35_8_1_machine_options); pc_q35_8_1_machine_options);
@ -393,7 +404,6 @@ static void pc_q35_8_0_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_8_1_machine_options(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, hw_compat_8_0, hw_compat_8_0_len);
compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len); compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len);

11
hw/m68k/virt.c
View File

@ -347,10 +347,17 @@ type_init(virt_machine_register_types)
} \ } \
type_init(machvirt_machine_##major##_##minor##_init); type_init(machvirt_machine_##major##_##minor##_init);
static void virt_machine_8_1_options(MachineClass *mc) static void virt_machine_8_2_options(MachineClass *mc)
{ {
} }
DEFINE_VIRT_MACHINE(8, 1, true) DEFINE_VIRT_MACHINE(8, 2, true)
static void virt_machine_8_1_options(MachineClass *mc)
{
virt_machine_8_2_options(mc);
compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len);
}
DEFINE_VIRT_MACHINE(8, 1, false)
static void virt_machine_8_0_options(MachineClass *mc) static void virt_machine_8_0_options(MachineClass *mc)
{ {

17
hw/ppc/spapr.c
View File

@ -4753,14 +4753,25 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
type_init(spapr_machine_register_##suffix) type_init(spapr_machine_register_##suffix)
/* /*
* pseries-8.1 * pseries-8.2
*/ */
static void spapr_machine_8_1_class_options(MachineClass *mc) static void spapr_machine_8_2_class_options(MachineClass *mc)
{ {
/* Defaults for the latest behaviour inherited from the base class */ /* Defaults for the latest behaviour inherited from the base class */
} }
DEFINE_SPAPR_MACHINE(8_1, "8.1", true); DEFINE_SPAPR_MACHINE(8_2, "8.2", true);
/*
* pseries-8.1
*/
static void spapr_machine_8_1_class_options(MachineClass *mc)
{
spapr_machine_8_2_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len);
}
DEFINE_SPAPR_MACHINE(8_1, "8.1", false);
/* /*
* pseries-8.0 * pseries-8.0

14
hw/s390x/s390-virtio-ccw.c
View File

@ -828,14 +828,26 @@ bool css_migration_enabled(void)
} \ } \
type_init(ccw_machine_register_##suffix) type_init(ccw_machine_register_##suffix)
static void ccw_machine_8_2_instance_options(MachineState *machine)
{
}
static void ccw_machine_8_2_class_options(MachineClass *mc)
{
}
DEFINE_CCW_MACHINE(8_2, "8.2", true);
static void ccw_machine_8_1_instance_options(MachineState *machine) static void ccw_machine_8_1_instance_options(MachineState *machine)
{ {
ccw_machine_8_2_instance_options(machine);
} }
static void ccw_machine_8_1_class_options(MachineClass *mc) static void ccw_machine_8_1_class_options(MachineClass *mc)
{ {
ccw_machine_8_2_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len);
} }
DEFINE_CCW_MACHINE(8_1, "8.1", true); DEFINE_CCW_MACHINE(8_1, "8.1", false);
static void ccw_machine_8_0_instance_options(MachineState *machine) static void ccw_machine_8_0_instance_options(MachineState *machine)
{ {

3
include/hw/boards.h
View File

@ -390,6 +390,9 @@ struct MachineState {
} \ } \
type_init(machine_initfn##_register_types) type_init(machine_initfn##_register_types)
extern GlobalProperty hw_compat_8_1[];
extern const size_t hw_compat_8_1_len;
extern GlobalProperty hw_compat_8_0[]; extern GlobalProperty hw_compat_8_0[];
extern const size_t hw_compat_8_0_len; extern const size_t hw_compat_8_0_len;

3
include/hw/i386/pc.h
View File

@ -200,6 +200,9 @@ void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids,
/* sgx.c */ /* sgx.c */
void pc_machine_init_sgx_epc(PCMachineState *pcms); void pc_machine_init_sgx_epc(PCMachineState *pcms);
extern GlobalProperty pc_compat_8_1[];
extern const size_t pc_compat_8_1_len;
extern GlobalProperty pc_compat_8_0[]; extern GlobalProperty pc_compat_8_0[];
extern const size_t pc_compat_8_0_len; extern const size_t pc_compat_8_0_len;