OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw: Add compat machines for 7.1 

Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20220316145521.1224083-1-cohuck@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Cornelia Huck 2022-03-16 15:55:21 +01:00 committed by Thomas Huth
parent 4667619269
commit 0ca703662e
10 changed files with 82 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/arm/virt.c
View File

@ -3022,10 +3022,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
static void virt_machine_7_0_options(MachineClass *mc)
static void virt_machine_7_1_options(MachineClass *mc)
{
}
DEFINE_VIRT_MACHINE_AS_LATEST(7, 0)
DEFINE_VIRT_MACHINE_AS_LATEST(7, 1)
static void virt_machine_7_0_options(MachineClass *mc)
{
virt_machine_7_1_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len);
}
DEFINE_VIRT_MACHINE(7, 0)
static void virt_machine_6_2_options(MachineClass *mc)
{

3
hw/core/machine.c
View File

@ -37,6 +37,9 @@
#include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-pci.h"
GlobalProperty hw_compat_7_0[] = {};
const size_t hw_compat_7_0_len = G_N_ELEMENTS(hw_compat_7_0);
GlobalProperty hw_compat_6_2[] = {
{ "PIIX4_PM", "x-not-migrate-acpi-index", "on"},
};

3
hw/i386/pc.c
View File

@ -95,6 +95,9 @@
#include "trace.h"
#include CONFIG_DEVICES
GlobalProperty pc_compat_7_0[] = {};
const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0);
GlobalProperty pc_compat_6_2[] = {
{ "virtio-mem", "unplugged-inaccessible", "off" },
};

14
hw/i386/pc_piix.c
View File

@ -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_7_0_machine_options(MachineClass *m)
static void pc_i440fx_7_1_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_machine_options(m);
@ -424,6 +424,18 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m)
pcmc->default_cpu_version = 1;
}
DEFINE_I440FX_MACHINE(v7_1, "pc-i440fx-7.1", NULL,
pc_i440fx_7_1_machine_options);
static void pc_i440fx_7_0_machine_options(MachineClass *m)
{
pc_i440fx_7_1_machine_options(m);
m->alias = NULL;
m->is_default = false;
compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len);
compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len);
}
DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL,
pc_i440fx_7_0_machine_options);

13
hw/i386/pc_q35.c
View File

@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288;
}
static void pc_q35_7_0_machine_options(MachineClass *m)
static void pc_q35_7_1_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_machine_options(m);
@ -368,6 +368,17 @@ static void pc_q35_7_0_machine_options(MachineClass *m)
pcmc->default_cpu_version = 1;
}
DEFINE_Q35_MACHINE(v7_1, "pc-q35-7.1", NULL,
pc_q35_7_1_machine_options);
static void pc_q35_7_0_machine_options(MachineClass *m)
{
pc_q35_7_1_machine_options(m);
m->alias = NULL;
compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len);
compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len);
}
DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL,
pc_q35_7_0_machine_options);

11
hw/m68k/virt.c
View File

@ -315,10 +315,17 @@ type_init(virt_machine_register_types)
} \
type_init(machvirt_machine_##major##_##minor##_init);
static void virt_machine_7_0_options(MachineClass *mc)
static void virt_machine_7_1_options(MachineClass *mc)
{
}
DEFINE_VIRT_MACHINE(7, 0, true)
DEFINE_VIRT_MACHINE(7, 1, true)
static void virt_machine_7_0_options(MachineClass *mc)
{
virt_machine_7_1_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len);
}
DEFINE_VIRT_MACHINE(7, 0, false)
static void virt_machine_6_2_options(MachineClass *mc)
{

17
hw/ppc/spapr.c
View File

@ -4703,14 +4703,25 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
type_init(spapr_machine_register_##suffix)
/*
* pseries-7.0
* pseries-7.1
*/
static void spapr_machine_7_0_class_options(MachineClass *mc)
static void spapr_machine_7_1_class_options(MachineClass *mc)
{
/* Defaults for the latest behaviour inherited from the base class */
}
DEFINE_SPAPR_MACHINE(7_0, "7.0", true);
DEFINE_SPAPR_MACHINE(7_1, "7.1", true);
/*
* pseries-7.0
*/
static void spapr_machine_7_0_class_options(MachineClass *mc)
{
spapr_machine_7_1_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len);
}
DEFINE_SPAPR_MACHINE(7_0, "7.0", false);
/*
* pseries-6.2

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

@ -792,14 +792,26 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
static void ccw_machine_7_1_instance_options(MachineState *machine)
{
}
static void ccw_machine_7_1_class_options(MachineClass *mc)
{
}
DEFINE_CCW_MACHINE(7_1, "7.1", true);
static void ccw_machine_7_0_instance_options(MachineState *machine)
{
ccw_machine_7_1_instance_options(machine);
}
static void ccw_machine_7_0_class_options(MachineClass *mc)
{
ccw_machine_7_1_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len);
}
DEFINE_CCW_MACHINE(7_0, "7.0", true);
DEFINE_CCW_MACHINE(7_0, "7.0", false);
static void ccw_machine_6_2_instance_options(MachineState *machine)
{

3
include/hw/boards.h
View File

@ -380,6 +380,9 @@ struct MachineState {
} \
type_init(machine_initfn##_register_types)
extern GlobalProperty hw_compat_7_0[];
extern const size_t hw_compat_7_0_len;
extern GlobalProperty hw_compat_6_2[];
extern const size_t hw_compat_6_2_len;

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

@ -202,6 +202,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
/* sgx.c */
void pc_machine_init_sgx_epc(PCMachineState *pcms);
extern GlobalProperty pc_compat_7_0[];
extern const size_t pc_compat_7_0_len;
extern GlobalProperty pc_compat_6_2[];
extern const size_t pc_compat_6_2_len;