motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 07:43:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/s390x/s390-virtio-ccw: Remove the deprecated 4.0 machine type

Browse source 
The s390-ccw-virtio-4.0 machine is older than 6 years, so according to
our machine support policy, it can be removed now. The corresponding
v4.0 CPU feature group gets merged into the minimum feature group now.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250506062148.306084-10-thuth@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-05-06 08:21:48 +02:00
parent 3b912daea0
commit 1b432c51cd
2 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1158,20 +1158,6 @@ static void ccw_machine_4_1_class_options(MachineClass *mc)
} }
DEFINE_CCW_MACHINE(4, 1); DEFINE_CCW_MACHINE(4, 1);
static void ccw_machine_4_0_instance_options(MachineState *machine)
{
static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V4_0 };
ccw_machine_4_1_instance_options(machine);
s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
}
static void ccw_machine_4_0_class_options(MachineClass *mc)
{
ccw_machine_4_1_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
}
DEFINE_CCW_MACHINE(4, 0);
static void ccw_machine_register_types(void) static void ccw_machine_register_types(void)
{ {
type_register_static(&ccw_machine_info); type_register_static(&ccw_machine_info);

4
target/s390x/gen-features.c
View file

@ -878,9 +878,6 @@ static uint16_t qemu_MIN[] = {
S390_FEAT_ADAPTER_INT_SUPPRESSION, S390_FEAT_ADAPTER_INT_SUPPRESSION,
S390_FEAT_MSA_EXT_3, S390_FEAT_MSA_EXT_3,
S390_FEAT_MSA_EXT_4, S390_FEAT_MSA_EXT_4,
};
static uint16_t qemu_V4_0[] = {
/* /*
* Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER not * Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER not
* implemented yet). * implemented yet).
@ -1052,7 +1049,6 @@ static FeatGroupDefSpec FeatGroupDef[] = {
*******************************/ *******************************/
static FeatGroupDefSpec QemuFeatDef[] = { static FeatGroupDefSpec QemuFeatDef[] = {
QEMU_FEAT_INITIALIZER(MIN), QEMU_FEAT_INITIALIZER(MIN),
QEMU_FEAT_INITIALIZER(V4_0),
QEMU_FEAT_INITIALIZER(V4_1), QEMU_FEAT_INITIALIZER(V4_1),
QEMU_FEAT_INITIALIZER(V6_0), QEMU_FEAT_INITIALIZER(V6_0),
QEMU_FEAT_INITIALIZER(V6_2), QEMU_FEAT_INITIALIZER(V6_2),