SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw: add compat machines for 5.2

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

Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20200819144016.281156-1-cohuck@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Cornelia Huck 2020-08-19 16:40:16 +02:00 committed by Eduardo Habkost
parent c556600598
commit 3ff3c5d317
9 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/arm/virt.c
View File

@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void)
} }
type_init(machvirt_machine_init); type_init(machvirt_machine_init);
static void virt_machine_5_1_options(MachineClass *mc) static void virt_machine_5_2_options(MachineClass *mc)
{ {
} }
DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) DEFINE_VIRT_MACHINE_AS_LATEST(5, 2)
static void virt_machine_5_1_options(MachineClass *mc)
{
virt_machine_5_2_options(mc);
compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len);
}
DEFINE_VIRT_MACHINE(5, 1)
static void virt_machine_5_0_options(MachineClass *mc) static void virt_machine_5_0_options(MachineClass *mc)
{ {

3
hw/core/machine.c
View File

@ -28,6 +28,9 @@
#include "hw/mem/nvdimm.h" #include "hw/mem/nvdimm.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
GlobalProperty hw_compat_5_1[] = {};
const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1);
GlobalProperty hw_compat_5_0[] = { GlobalProperty hw_compat_5_0[] = {
{ "pci-host-bridge", "x-config-reg-migration-enabled", "off" }, { "pci-host-bridge", "x-config-reg-migration-enabled", "off" },
{ "virtio-balloon-device", "page-poison", "false" }, { "virtio-balloon-device", "page-poison", "false" },

3
hw/i386/pc.c
View File

@ -97,6 +97,9 @@
#include "fw_cfg.h" #include "fw_cfg.h"
#include "trace.h" #include "trace.h"
GlobalProperty pc_compat_5_1[] = {};
const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1);
GlobalProperty pc_compat_5_0[] = { GlobalProperty pc_compat_5_0[] = {
}; };
const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0);

14
hw/i386/pc_piix.c
View File

@ -426,7 +426,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_5_1_machine_options(MachineClass *m) static void pc_i440fx_5_2_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);
@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m)
pcmc->default_cpu_version = 1; pcmc->default_cpu_version = 1;
} }
DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL,
pc_i440fx_5_2_machine_options);
static void pc_i440fx_5_1_machine_options(MachineClass *m)
{
pc_i440fx_5_2_machine_options(m);
m->alias = NULL;
m->is_default = false;
compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len);
compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len);
}
DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL,
pc_i440fx_5_1_machine_options); pc_i440fx_5_1_machine_options);

13
hw/i386/pc_q35.c
View File

@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m)
m->max_cpus = 288; m->max_cpus = 288;
} }
static void pc_q35_5_1_machine_options(MachineClass *m) static void pc_q35_5_2_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);
@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass *m)
pcmc->default_cpu_version = 1; pcmc->default_cpu_version = 1;
} }
DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL,
pc_q35_5_2_machine_options);
static void pc_q35_5_1_machine_options(MachineClass *m)
{
pc_q35_5_2_machine_options(m);
m->alias = NULL;
compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len);
compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len);
}
DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL,
pc_q35_5_1_machine_options); pc_q35_5_1_machine_options);

17
hw/ppc/spapr.c
View File

@ -4580,14 +4580,25 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
type_init(spapr_machine_register_##suffix) type_init(spapr_machine_register_##suffix)
/* /*
* pseries-5.1 * pseries-5.2
*/ */
static void spapr_machine_5_1_class_options(MachineClass *mc) static void spapr_machine_5_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(5_1, "5.1", true); DEFINE_SPAPR_MACHINE(5_2, "5.2", true);
/*
* pseries-5.1
*/
static void spapr_machine_5_1_class_options(MachineClass *mc)
{
spapr_machine_5_2_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len);
}
DEFINE_SPAPR_MACHINE(5_1, "5.1", false);
/* /*
* pseries-5.0 * pseries-5.0

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

@ -801,14 +801,26 @@ bool css_migration_enabled(void)
} \ } \
type_init(ccw_machine_register_##suffix) type_init(ccw_machine_register_##suffix)
static void ccw_machine_5_2_instance_options(MachineState *machine)
{
}
static void ccw_machine_5_2_class_options(MachineClass *mc)
{
}
DEFINE_CCW_MACHINE(5_2, "5.2", true);
static void ccw_machine_5_1_instance_options(MachineState *machine) static void ccw_machine_5_1_instance_options(MachineState *machine)
{ {
ccw_machine_5_2_instance_options(machine);
} }
static void ccw_machine_5_1_class_options(MachineClass *mc) static void ccw_machine_5_1_class_options(MachineClass *mc)
{ {
ccw_machine_5_2_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len);
} }
DEFINE_CCW_MACHINE(5_1, "5.1", true); DEFINE_CCW_MACHINE(5_1, "5.1", false);
static void ccw_machine_5_0_instance_options(MachineState *machine) static void ccw_machine_5_0_instance_options(MachineState *machine)
{ {

3
include/hw/boards.h
View File

@ -319,6 +319,9 @@ struct MachineState {
} \ } \
type_init(machine_initfn##_register_types) type_init(machine_initfn##_register_types)
extern GlobalProperty hw_compat_5_1[];
extern const size_t hw_compat_5_1_len;
extern GlobalProperty hw_compat_5_0[]; extern GlobalProperty hw_compat_5_0[];
extern const size_t hw_compat_5_0_len; extern const size_t hw_compat_5_0_len;

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

@ -193,6 +193,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);
void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
const CPUArchIdList *apic_ids, GArray *entry); const CPUArchIdList *apic_ids, GArray *entry);
extern GlobalProperty pc_compat_5_1[];
extern const size_t pc_compat_5_1_len;
extern GlobalProperty pc_compat_5_0[]; extern GlobalProperty pc_compat_5_0[];
extern const size_t pc_compat_5_0_len; extern const size_t pc_compat_5_0_len;