diff options
| author | Jason J. Herne | 2017-04-10 15:39:00 +0200 |
|---|---|---|
| committer | Christian Borntraeger | 2017-07-14 12:29:49 +0200 |
| commit | 7223bccea3654b6bd6e10f0fb6d0099f1a4b0e80 (patch) | |
| tree | ae79a69acd5bd00076d6010090590fda44ad1711 /target | |
| parent | s390x/cpumodel: we are always in zarchitecture mode (diff) | |
| download | qemu-7223bccea3654b6bd6e10f0fb6d0099f1a4b0e80.tar.gz qemu-7223bccea3654b6bd6e10f0fb6d0099f1a4b0e80.tar.xz qemu-7223bccea3654b6bd6e10f0fb6d0099f1a4b0e80.zip | |
s390x/cpumodel: add esop/esop2 to z12 model
Add esop and esop2 features to z12 model where esop2 was originally
introduced. Disable esop and esop2 when using compatibility machine
v2.9 or earlier.
Signed-off-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/s390x/gen-features.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 33404e4b07..af14b11199 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -429,6 +429,7 @@ static uint16_t full_GEN12_GA1[] = { S390_FEAT_ADAPTER_EVENT_NOTIFICATION, S390_FEAT_ADAPTER_INT_SUPPRESSION, S390_FEAT_EDAT_2, + S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2, }; static uint16_t full_GEN12_GA2[] = { @@ -488,6 +489,8 @@ static uint16_t default_GEN12_GA1[] = { S390_FEAT_ZPCI, S390_FEAT_ADAPTER_EVENT_NOTIFICATION, S390_FEAT_EDAT_2, + S390_FEAT_ESOP, + S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2, }; #define default_GEN12_GA2 EmptyFeat |