mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-28 22:33:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

s390x: add zPCI feature to "qemu" CPU model

Browse Source 
As we now always have PCI support, let's add it to the "qemu" CPU model,
taking care of backwards compatibility.

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20190212112323.15904-1-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
David Hildenbrand 2019-02-12 12:23:23 +01:00 committed by Cornelia Huck
parent 965018bea7
commit d646b16b21
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,7 +657,10 @@ DEFINE_CCW_MACHINE(4_0, "4.0", true);
static void ccw_machine_3_1_instance_options(MachineState *machine) static void ccw_machine_3_1_instance_options(MachineState *machine)
{ {
static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 };
ccw_machine_4_0_instance_options(machine); ccw_machine_4_0_instance_options(machine);
s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
} }
static void ccw_machine_3_1_class_options(MachineClass *mc) static void ccw_machine_3_1_class_options(MachineClass *mc)

8
target/s390x/gen-features.c
View File

@ -560,7 +560,7 @@ static uint16_t qemu_V2_11[] = {
S390_FEAT_ZARCH, S390_FEAT_ZARCH,
}; };
static uint16_t qemu_LATEST[] = { static uint16_t qemu_V3_1[] = {
S390_FEAT_DAT_ENH, S390_FEAT_DAT_ENH,
S390_FEAT_IDTE_SEGMENT, S390_FEAT_IDTE_SEGMENT,
S390_FEAT_STFLE, S390_FEAT_STFLE,
@ -592,13 +592,16 @@ static uint16_t qemu_LATEST[] = {
S390_FEAT_MSA_EXT_4, S390_FEAT_MSA_EXT_4,
}; };
static uint16_t qemu_LATEST[] = {
S390_FEAT_ZPCI,
};
/* add all new definitions before this point */ /* add all new definitions before this point */
static uint16_t qemu_MAX[] = { static uint16_t qemu_MAX[] = {
/* z13+ features */ /* z13+ features */
S390_FEAT_STFLE_53, S390_FEAT_STFLE_53,
/* generates a dependency warning, leave it out for now */ /* generates a dependency warning, leave it out for now */
S390_FEAT_MSA_EXT_5, S390_FEAT_MSA_EXT_5,
S390_FEAT_ZPCI,
}; };
/****** END FEATURE DEFS ******/ /****** END FEATURE DEFS ******/
@ -708,6 +711,7 @@ static FeatGroupDefSpec FeatGroupDef[] = {
*******************************/ *******************************/
static FeatGroupDefSpec QemuFeatDef[] = { static FeatGroupDefSpec QemuFeatDef[] = {
QEMU_FEAT_INITIALIZER(V2_11), QEMU_FEAT_INITIALIZER(V2_11),
QEMU_FEAT_INITIALIZER(V3_1),
QEMU_FEAT_INITIALIZER(LATEST), QEMU_FEAT_INITIALIZER(LATEST),
QEMU_FEAT_INITIALIZER(MAX), QEMU_FEAT_INITIALIZER(MAX),
}; };