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

hw: Add compat machines for 8.0 

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

Reviewed-by: Cédric Le Goater <clg@kaod.org> [ppc]
Reviewed-by: Thomas Huth <thuth@redhat.com> [s390x]
Reviewed-by: Greg Kurz <groug@kaod.org> [ppc]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20221212152145.124317-2-cohuck@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Cornelia Huck 2022-12-12 16:21:44 +01:00 committed by Michael S. Tsirkin
parent 6f10a29e76
commit db723c80b1
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

@ -3218,10 +3218,17 @@ static void machvirt_machine_init(void)
} }
type_init(machvirt_machine_init); type_init(machvirt_machine_init);
static void virt_machine_7_2_options(MachineClass *mc) static void virt_machine_8_0_options(MachineClass *mc)
{ {
} }
DEFINE_VIRT_MACHINE_AS_LATEST(7, 2) DEFINE_VIRT_MACHINE_AS_LATEST(8, 0)
static void virt_machine_7_2_options(MachineClass *mc)
{
virt_machine_8_0_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
}
DEFINE_VIRT_MACHINE(7, 2)
static void virt_machine_7_1_options(MachineClass *mc) static void virt_machine_7_1_options(MachineClass *mc)
{ {

3
hw/core/machine.c
View File

@ -40,6 +40,9 @@
#include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-pci.h"
#include "qom/object_interfaces.h" #include "qom/object_interfaces.h"
GlobalProperty hw_compat_7_2[] = {};
const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
GlobalProperty hw_compat_7_1[] = { GlobalProperty hw_compat_7_1[] = {
{ "virtio-device", "queue_reset", "false" }, { "virtio-device", "queue_reset", "false" },
}; };

3
hw/i386/pc.c
View File

@ -107,6 +107,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_7_2[] = {};
const size_t pc_compat_7_2_len = G_N_ELEMENTS(pc_compat_7_2);
GlobalProperty pc_compat_7_1[] = {}; GlobalProperty pc_compat_7_1[] = {};
const size_t pc_compat_7_1_len = G_N_ELEMENTS(pc_compat_7_1); const size_t pc_compat_7_1_len = G_N_ELEMENTS(pc_compat_7_1);

14
hw/i386/pc_piix.c
View File

@ -435,7 +435,7 @@ 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_7_2_machine_options(MachineClass *m) static void pc_i440fx_8_0_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_machine_options(m); pc_i440fx_machine_options(m);
@ -444,6 +444,18 @@ static void pc_i440fx_7_2_machine_options(MachineClass *m)
pcmc->default_cpu_version = 1; pcmc->default_cpu_version = 1;
} }
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);
}
DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL, DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL,
pc_i440fx_7_2_machine_options); pc_i440fx_7_2_machine_options);

13
hw/i386/pc_q35.c
View File

@ -370,7 +370,7 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288; m->max_cpus = 288;
} }
static void pc_q35_7_2_machine_options(MachineClass *m) static void pc_q35_8_0_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_machine_options(m); pc_q35_machine_options(m);
@ -378,6 +378,17 @@ static void pc_q35_7_2_machine_options(MachineClass *m)
pcmc->default_cpu_version = 1; pcmc->default_cpu_version = 1;
} }
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);
}
DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL, DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL,
pc_q35_7_2_machine_options); pc_q35_7_2_machine_options);

11
hw/m68k/virt.c
View File

@ -346,10 +346,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_7_2_options(MachineClass *mc) static void virt_machine_8_0_options(MachineClass *mc)
{ {
} }
DEFINE_VIRT_MACHINE(7, 2, true) DEFINE_VIRT_MACHINE(8, 0, true)
static void virt_machine_7_2_options(MachineClass *mc)
{
virt_machine_8_0_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
}
DEFINE_VIRT_MACHINE(7, 2, false)
static void virt_machine_7_1_options(MachineClass *mc) static void virt_machine_7_1_options(MachineClass *mc)
{ {

17
hw/ppc/spapr.c
View File

@ -4734,14 +4734,25 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
type_init(spapr_machine_register_##suffix) type_init(spapr_machine_register_##suffix)
/* /*
* pseries-7.2 * pseries-8.0
*/ */
static void spapr_machine_7_2_class_options(MachineClass *mc) static void spapr_machine_8_0_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(7_2, "7.2", true); DEFINE_SPAPR_MACHINE(8_0, "8.0", true);
/*
* pseries-7.2
*/
static void spapr_machine_7_2_class_options(MachineClass *mc)
{
spapr_machine_8_0_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
}
DEFINE_SPAPR_MACHINE(7_2, "7.2", false);
/* /*
* pseries-7.1 * pseries-7.1

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

@ -823,14 +823,26 @@ bool css_migration_enabled(void)
} \ } \
type_init(ccw_machine_register_##suffix) type_init(ccw_machine_register_##suffix)
static void ccw_machine_8_0_instance_options(MachineState *machine)
{
}
static void ccw_machine_8_0_class_options(MachineClass *mc)
{
}
DEFINE_CCW_MACHINE(8_0, "8.0", true);
static void ccw_machine_7_2_instance_options(MachineState *machine) static void ccw_machine_7_2_instance_options(MachineState *machine)
{ {
ccw_machine_8_0_instance_options(machine);
} }
static void ccw_machine_7_2_class_options(MachineClass *mc) static void ccw_machine_7_2_class_options(MachineClass *mc)
{ {
ccw_machine_8_0_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len);
} }
DEFINE_CCW_MACHINE(7_2, "7.2", true); DEFINE_CCW_MACHINE(7_2, "7.2", false);
static void ccw_machine_7_1_instance_options(MachineState *machine) static void ccw_machine_7_1_instance_options(MachineState *machine)
{ {

3
include/hw/boards.h
View File

@ -379,6 +379,9 @@ struct MachineState {
} \ } \
type_init(machine_initfn##_register_types) type_init(machine_initfn##_register_types)
extern GlobalProperty hw_compat_7_2[];
extern const size_t hw_compat_7_2_len;
extern GlobalProperty hw_compat_7_1[]; extern GlobalProperty hw_compat_7_1[];
extern const size_t hw_compat_7_1_len; extern const size_t hw_compat_7_1_len;

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

@ -200,6 +200,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
/* sgx.c */ /* sgx.c */
void pc_machine_init_sgx_epc(PCMachineState *pcms); void pc_machine_init_sgx_epc(PCMachineState *pcms);
extern GlobalProperty pc_compat_7_2[];
extern const size_t pc_compat_7_2_len;
extern GlobalProperty pc_compat_7_1[]; extern GlobalProperty pc_compat_7_1[];
extern const size_t pc_compat_7_1_len; extern const size_t pc_compat_7_1_len;