On 17.07.2017 19:33, David Hildenbrand wrote: > On 14.07.2017 12:41, Christian Borntraeger wrote: >> From: "Jason J. Herne" <jjhe...@linux.vnet.ibm.com> >> >> In QEMU, a guest VCPU always started in and never was able to leave >> z/Architecture mode. Now we have an architected way of showing this >> condition. >> >> The SIGP SET ARCHITECTURE instruction is simply rejected. Linux as guest >> seems to not care about the return value, which is a good thing >> The new handling is just like already being in z/Architecture mode. >> >> We'll not try to fake absence of this facility, but still not indicate >> the facility in case some strange CPU model turned z/Architecture off >> completely (which doesn't work either way but let's us see how a >> guest would react on a lack of this facility). >> >> Signed-off-by: Jason J. Herne <jjhe...@linux.vnet.ibm.com> >> Acked-by: Christian Borntraeger <borntrae...@de.ibm.com> >> Acked-by: Cornelia Huck <cornelia.h...@de.ibm.com> >> Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com> >> --- >> target/s390x/cpu_features.c | 5 +++-- >> target/s390x/kvm.c | 38 +++++++++++--------------------------- >> 2 files changed, 14 insertions(+), 29 deletions(-) >> >> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c >> index e5a3f71..fa887d9 100644 >> --- a/target/s390x/cpu_features.c >> +++ b/target/s390x/cpu_features.c >> @@ -337,8 +337,9 @@ void s390_fill_feat_block(const S390FeatBitmap features, >> S390FeatType type, >> int bit_nr; >> >> if (type == S390_FEAT_TYPE_STFL && test_bit(S390_FEAT_ZARCH, features)) >> { >> - /* z/Architecture is always active if around */ >> - data[0] |= 0x20; >> + /* Features that are always active */ >> + data[0] |= 0x20; /* z/Architecture */ >> + data[17] |= 0x20; /* Configuration-z-architectural-mode */ >> } > > This also requires changes in TCG , no? (set architecture there is left > untouched) > >
Never mind, just realized we do our own block creation in do_stfle.... -- Thanks, David