* [Qemu-devel] [PATCH] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility @ 2018-02-05 9:09 David Hildenbrand 2018-02-05 9:31 ` no-reply 2018-02-05 9:34 ` David Hildenbrand 0 siblings, 2 replies; 4+ messages in thread From: David Hildenbrand @ 2018-02-05 9:09 UTC (permalink / raw) To: qemu-s390x, qemu-devel Cc: Christian Borntraeger, Cornelia Huck, Richard Henderson, Alexander Graf, Thomas Huth, David Hildenbrand For now, the kernel does not properly indicate configured CPU subfunctions to the guest, but simply uses the host values (as support in KVM is still missing). That's why we missed to model the PTFF subfunctions that come with Multiple-epoch facility. Let's properly add these, along with a new feature group. Signed-off-by: David Hildenbrand <david@redhat.com> --- target/s390x/cpu_features.c | 5 +++++ target/s390x/cpu_features_def.h | 4 ++++ target/s390x/gen-features.c | 10 ++++++++++ 3 files changed, 19 insertions(+) diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c index 85d10b5710..8606e52ca0 100644 --- a/target/s390x/cpu_features.c +++ b/target/s390x/cpu_features.c @@ -156,8 +156,12 @@ static const S390FeatDef s390_features[] = { FEAT_INIT("ptff-qpc", S390_FEAT_TYPE_PTFF, 3, "PTFF Query Physical Clock"), FEAT_INIT("ptff-qui", S390_FEAT_TYPE_PTFF, 4, "PTFF Query UTC Information"), FEAT_INIT("ptff-qtou", S390_FEAT_TYPE_PTFF, 5, "PTFF Query TOD Offset User"), + FEAT_INIT("ptff-qsie", S390_FEAT_TYPE_PTFF, 10, "PTFF Query Steering Information Extended"), + FEAT_INIT("ptff-qtoue", S390_FEAT_TYPE_PTFF, 13, "PTFF Query TOD Offset User Extended"), FEAT_INIT("ptff-sto", S390_FEAT_TYPE_PTFF, 65, "PTFF Set TOD Offset"), FEAT_INIT("ptff-stou", S390_FEAT_TYPE_PTFF, 69, "PTFF Set TOD Offset User"), + FEAT_INIT("ptff-stoe", S390_FEAT_TYPE_PTFF, 73, "PTFF Set TOD Offset Extended"), + FEAT_INIT("ptff-stoue", S390_FEAT_TYPE_PTFF, 77, "PTFF Set TOD Offset User Extended"), FEAT_INIT("kmac-dea", S390_FEAT_TYPE_KMAC, 1, "KMAC DEA"), FEAT_INIT("kmac-tdea-128", S390_FEAT_TYPE_KMAC, 2, "KMAC TDEA-128"), @@ -445,6 +449,7 @@ static S390FeatGroupDef s390_feature_groups[] = { FEAT_GROUP_INIT("plo", PLO, "Perform-locked-operation facility"), FEAT_GROUP_INIT("tods", TOD_CLOCK_STEERING, "Tod-clock-steering facility"), FEAT_GROUP_INIT("gen13ptff", GEN13_PTFF, "PTFF enhancements introduced with z13"), + FEAT_GROUP_INIT("mepochptff", MEPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"), FEAT_GROUP_INIT("msa", MSA, "Message-security-assist facility"), FEAT_GROUP_INIT("msa1", MSA_EXT_1, "Message-security-assist-extension 1 facility"), FEAT_GROUP_INIT("msa2", MSA_EXT_2, "Message-security-assist-extension 2 facility"), diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h index 4d930871b4..7c5915c7b2 100644 --- a/target/s390x/cpu_features_def.h +++ b/target/s390x/cpu_features_def.h @@ -151,8 +151,12 @@ typedef enum { S390_FEAT_PTFF_QPT, S390_FEAT_PTFF_QUI, S390_FEAT_PTFF_QTOU, + S390_FEAT_PTFF_QSIE, + S390_FEAT_PTFF_QTOUE, S390_FEAT_PTFF_STO, S390_FEAT_PTFF_STOU, + S390_FEAT_PTFF_STOE, + S390_FEAT_PTFF_STOUE, /* KMAC */ S390_FEAT_KMAC_DEA, diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 58b6ac484e..8c04ff913f 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -59,6 +59,12 @@ S390_FEAT_PTFF_QTOU, \ S390_FEAT_PTFF_STOU +#define S390_FEAT_GROUP_MEPOCH_PTFF \ + S390_FEAT_PTFF_QSIE, \ + S390_FEAT_PTFF_QTOUE, \ + S390_FEAT_PTFF_STOE, \ + S390_FEAT_PTFF_STOUE + #define S390_FEAT_GROUP_MSA \ S390_FEAT_MSA, \ S390_FEAT_KMAC_DEA, \ @@ -219,6 +225,9 @@ static uint16_t group_TOD_CLOCK_STEERING[] = { static uint16_t group_GEN13_PTFF[] = { S390_FEAT_GROUP_GEN13_PTFF, }; +static uint16_t group_MEPOCH_PTFF[] = { + S390_FEAT_GROUP_MEPOCH_PTFF, +}; static uint16_t group_MSA[] = { S390_FEAT_GROUP_MSA, }; @@ -665,6 +674,7 @@ static FeatGroupDefSpec FeatGroupDef[] = { FEAT_GROUP_INITIALIZER(PLO), FEAT_GROUP_INITIALIZER(TOD_CLOCK_STEERING), FEAT_GROUP_INITIALIZER(GEN13_PTFF), + FEAT_GROUP_INITIALIZER(MEPOCH_PTFF), FEAT_GROUP_INITIALIZER(MSA), FEAT_GROUP_INITIALIZER(MSA_EXT_1), FEAT_GROUP_INITIALIZER(MSA_EXT_2), -- 2.14.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility 2018-02-05 9:09 [Qemu-devel] [PATCH] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility David Hildenbrand @ 2018-02-05 9:31 ` no-reply 2018-02-05 9:34 ` David Hildenbrand 1 sibling, 0 replies; 4+ messages in thread From: no-reply @ 2018-02-05 9:31 UTC (permalink / raw) To: david; +Cc: famz, qemu-s390x, qemu-devel, thuth, cohuck, agraf, borntraeger, rth Hi, This series seems to have some coding style problems. See output below for more information: Type: series Message-id: 20180205090912.6110-1-david@redhat.com Subject: [Qemu-devel] [PATCH] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility === TEST SCRIPT BEGIN === #!/bin/bash BASE=base n=1 total=$(git log --oneline $BASE.. | wc -l) failed=0 git config --local diff.renamelimit 0 git config --local diff.renames True commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..." if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then failed=1 echo fi n=$((n+1)) done exit $failed === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' d605c816dc s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility === OUTPUT BEGIN === Checking PATCH 1/1: s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility... ERROR: line over 90 characters #25: FILE: target/s390x/cpu_features.c:159: + FEAT_INIT("ptff-qsie", S390_FEAT_TYPE_PTFF, 10, "PTFF Query Steering Information Extended"), ERROR: line over 90 characters #26: FILE: target/s390x/cpu_features.c:160: + FEAT_INIT("ptff-qtoue", S390_FEAT_TYPE_PTFF, 13, "PTFF Query TOD Offset User Extended"), WARNING: line over 80 characters #29: FILE: target/s390x/cpu_features.c:163: + FEAT_INIT("ptff-stoe", S390_FEAT_TYPE_PTFF, 73, "PTFF Set TOD Offset Extended"), WARNING: line over 80 characters #30: FILE: target/s390x/cpu_features.c:164: + FEAT_INIT("ptff-stoue", S390_FEAT_TYPE_PTFF, 77, "PTFF Set TOD Offset User Extended"), ERROR: line over 90 characters #38: FILE: target/s390x/cpu_features.c:452: + FEAT_GROUP_INIT("mepochptff", MEPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"), ERROR: Macros with complex values should be enclosed in parenthesis #67: FILE: target/s390x/gen-features.c:62: +#define S390_FEAT_GROUP_MEPOCH_PTFF \ + S390_FEAT_PTFF_QSIE, \ + S390_FEAT_PTFF_QTOUE, \ + S390_FEAT_PTFF_STOE, \ + S390_FEAT_PTFF_STOUE total: 4 errors, 2 warnings, 59 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. === OUTPUT END === Test command exited with code: 1 --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@freelists.org ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility 2018-02-05 9:09 [Qemu-devel] [PATCH] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility David Hildenbrand 2018-02-05 9:31 ` no-reply @ 2018-02-05 9:34 ` David Hildenbrand 2018-02-05 9:58 ` Christian Borntraeger 1 sibling, 1 reply; 4+ messages in thread From: David Hildenbrand @ 2018-02-05 9:34 UTC (permalink / raw) To: qemu-s390x, qemu-devel Cc: Christian Borntraeger, Cornelia Huck, Richard Henderson, Alexander Graf, Thomas Huth On 05.02.2018 10:09, David Hildenbrand wrote: > For now, the kernel does not properly indicate configured CPU subfunctions > to the guest, but simply uses the host values (as support in KVM is still > missing). That's why we missed to model the PTFF subfunctions that come > with Multiple-epoch facility. > > Let's properly add these, along with a new feature group. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/cpu_features.c | 5 +++++ > target/s390x/cpu_features_def.h | 4 ++++ > target/s390x/gen-features.c | 10 ++++++++++ > 3 files changed, 19 insertions(+) > > diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c > index 85d10b5710..8606e52ca0 100644 > --- a/target/s390x/cpu_features.c > +++ b/target/s390x/cpu_features.c > @@ -156,8 +156,12 @@ static const S390FeatDef s390_features[] = { > FEAT_INIT("ptff-qpc", S390_FEAT_TYPE_PTFF, 3, "PTFF Query Physical Clock"), > FEAT_INIT("ptff-qui", S390_FEAT_TYPE_PTFF, 4, "PTFF Query UTC Information"), > FEAT_INIT("ptff-qtou", S390_FEAT_TYPE_PTFF, 5, "PTFF Query TOD Offset User"), > + FEAT_INIT("ptff-qsie", S390_FEAT_TYPE_PTFF, 10, "PTFF Query Steering Information Extended"), > + FEAT_INIT("ptff-qtoue", S390_FEAT_TYPE_PTFF, 13, "PTFF Query TOD Offset User Extended"), > FEAT_INIT("ptff-sto", S390_FEAT_TYPE_PTFF, 65, "PTFF Set TOD Offset"), > FEAT_INIT("ptff-stou", S390_FEAT_TYPE_PTFF, 69, "PTFF Set TOD Offset User"), > + FEAT_INIT("ptff-stoe", S390_FEAT_TYPE_PTFF, 73, "PTFF Set TOD Offset Extended"), > + FEAT_INIT("ptff-stoue", S390_FEAT_TYPE_PTFF, 77, "PTFF Set TOD Offset User Extended"), > > FEAT_INIT("kmac-dea", S390_FEAT_TYPE_KMAC, 1, "KMAC DEA"), > FEAT_INIT("kmac-tdea-128", S390_FEAT_TYPE_KMAC, 2, "KMAC TDEA-128"), > @@ -445,6 +449,7 @@ static S390FeatGroupDef s390_feature_groups[] = { > FEAT_GROUP_INIT("plo", PLO, "Perform-locked-operation facility"), > FEAT_GROUP_INIT("tods", TOD_CLOCK_STEERING, "Tod-clock-steering facility"), > FEAT_GROUP_INIT("gen13ptff", GEN13_PTFF, "PTFF enhancements introduced with z13"), > + FEAT_GROUP_INIT("mepochptff", MEPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"), > FEAT_GROUP_INIT("msa", MSA, "Message-security-assist facility"), > FEAT_GROUP_INIT("msa1", MSA_EXT_1, "Message-security-assist-extension 1 facility"), > FEAT_GROUP_INIT("msa2", MSA_EXT_2, "Message-security-assist-extension 2 facility"), > diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h > index 4d930871b4..7c5915c7b2 100644 > --- a/target/s390x/cpu_features_def.h > +++ b/target/s390x/cpu_features_def.h > @@ -151,8 +151,12 @@ typedef enum { > S390_FEAT_PTFF_QPT, > S390_FEAT_PTFF_QUI, > S390_FEAT_PTFF_QTOU, > + S390_FEAT_PTFF_QSIE, > + S390_FEAT_PTFF_QTOUE, > S390_FEAT_PTFF_STO, > S390_FEAT_PTFF_STOU, > + S390_FEAT_PTFF_STOE, > + S390_FEAT_PTFF_STOUE, > > /* KMAC */ > S390_FEAT_KMAC_DEA, > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index 58b6ac484e..8c04ff913f 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -59,6 +59,12 @@ > S390_FEAT_PTFF_QTOU, \ > S390_FEAT_PTFF_STOU > > +#define S390_FEAT_GROUP_MEPOCH_PTFF \ > + S390_FEAT_PTFF_QSIE, \ > + S390_FEAT_PTFF_QTOUE, \ > + S390_FEAT_PTFF_STOE, \ > + S390_FEAT_PTFF_STOUE > + > #define S390_FEAT_GROUP_MSA \ > S390_FEAT_MSA, \ > S390_FEAT_KMAC_DEA, \ > @@ -219,6 +225,9 @@ static uint16_t group_TOD_CLOCK_STEERING[] = { > static uint16_t group_GEN13_PTFF[] = { > S390_FEAT_GROUP_GEN13_PTFF, > }; > +static uint16_t group_MEPOCH_PTFF[] = { > + S390_FEAT_GROUP_MEPOCH_PTFF, > +}; > static uint16_t group_MSA[] = { > S390_FEAT_GROUP_MSA, > }; > @@ -665,6 +674,7 @@ static FeatGroupDefSpec FeatGroupDef[] = { > FEAT_GROUP_INITIALIZER(PLO), > FEAT_GROUP_INITIALIZER(TOD_CLOCK_STEERING), > FEAT_GROUP_INITIALIZER(GEN13_PTFF), > + FEAT_GROUP_INITIALIZER(MEPOCH_PTFF), > FEAT_GROUP_INITIALIZER(MSA), > FEAT_GROUP_INITIALIZER(MSA_EXT_1), > FEAT_GROUP_INITIALIZER(MSA_EXT_2), > Guess this hunk is missing: diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 8c04ff913f..cfb371dac3 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -475,6 +475,7 @@ static uint16_t full_GEN14_GA1[] = { S390_FEAT_CMM_NT, S390_FEAT_HPMA2, S390_FEAT_SIE_KSS, + S390_FEAT_GROUP_MEPOCH_PTFF, }; /* Default features (in order of release) And we should most probably add this: diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index bfd14723f1..deb870921b 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2221,6 +2221,14 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) return; } + /* PTFF subfunctions might be indicated although kernel support missing */ + if (!test_bit(S390_FEAT_MULTIPLE_EPOCH, model->features)) { + clear_bit(S390_FEAT_PTFF_QSIE, model->features); + clear_bit(S390_FEAT_PTFF_QTOUE, model->features); + clear_bit(S390_FEAT_PTFF_STOE, model->features); + clear_bit(S390_FEAT_PTFF_STOUE, model->features); + } + /* with cpu model support, CMM is only indicated if really available */ if (kvm_s390_cmma_available()) { set_bit(S390_FEAT_CMM, model->features); Unfortunately I don't have access to a z14. -- Thanks, David / dhildenb ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility 2018-02-05 9:34 ` David Hildenbrand @ 2018-02-05 9:58 ` Christian Borntraeger 0 siblings, 0 replies; 4+ messages in thread From: Christian Borntraeger @ 2018-02-05 9:58 UTC (permalink / raw) To: David Hildenbrand, qemu-s390x, qemu-devel Cc: Cornelia Huck, Richard Henderson, Alexander Graf, Thomas Huth On 02/05/2018 10:34 AM, David Hildenbrand wrote: > On 05.02.2018 10:09, David Hildenbrand wrote: >> For now, the kernel does not properly indicate configured CPU subfunctions >> to the guest, but simply uses the host values (as support in KVM is still >> missing). That's why we missed to model the PTFF subfunctions that come >> with Multiple-epoch facility. >> >> Let's properly add these, along with a new feature group. >> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> target/s390x/cpu_features.c | 5 +++++ >> target/s390x/cpu_features_def.h | 4 ++++ >> target/s390x/gen-features.c | 10 ++++++++++ >> 3 files changed, 19 insertions(+) >> >> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c >> index 85d10b5710..8606e52ca0 100644 >> --- a/target/s390x/cpu_features.c >> +++ b/target/s390x/cpu_features.c >> @@ -156,8 +156,12 @@ static const S390FeatDef s390_features[] = { >> FEAT_INIT("ptff-qpc", S390_FEAT_TYPE_PTFF, 3, "PTFF Query Physical Clock"), >> FEAT_INIT("ptff-qui", S390_FEAT_TYPE_PTFF, 4, "PTFF Query UTC Information"), >> FEAT_INIT("ptff-qtou", S390_FEAT_TYPE_PTFF, 5, "PTFF Query TOD Offset User"), >> + FEAT_INIT("ptff-qsie", S390_FEAT_TYPE_PTFF, 10, "PTFF Query Steering Information Extended"), >> + FEAT_INIT("ptff-qtoue", S390_FEAT_TYPE_PTFF, 13, "PTFF Query TOD Offset User Extended"), >> FEAT_INIT("ptff-sto", S390_FEAT_TYPE_PTFF, 65, "PTFF Set TOD Offset"), >> FEAT_INIT("ptff-stou", S390_FEAT_TYPE_PTFF, 69, "PTFF Set TOD Offset User"), >> + FEAT_INIT("ptff-stoe", S390_FEAT_TYPE_PTFF, 73, "PTFF Set TOD Offset Extended"), >> + FEAT_INIT("ptff-stoue", S390_FEAT_TYPE_PTFF, 77, "PTFF Set TOD Offset User Extended"), >> >> FEAT_INIT("kmac-dea", S390_FEAT_TYPE_KMAC, 1, "KMAC DEA"), >> FEAT_INIT("kmac-tdea-128", S390_FEAT_TYPE_KMAC, 2, "KMAC TDEA-128"), >> @@ -445,6 +449,7 @@ static S390FeatGroupDef s390_feature_groups[] = { >> FEAT_GROUP_INIT("plo", PLO, "Perform-locked-operation facility"), >> FEAT_GROUP_INIT("tods", TOD_CLOCK_STEERING, "Tod-clock-steering facility"), >> FEAT_GROUP_INIT("gen13ptff", GEN13_PTFF, "PTFF enhancements introduced with z13"), >> + FEAT_GROUP_INIT("mepochptff", MEPOCH_PTFF, "PTFF enhancements introduced with Multiple-epoch facility"), >> FEAT_GROUP_INIT("msa", MSA, "Message-security-assist facility"), >> FEAT_GROUP_INIT("msa1", MSA_EXT_1, "Message-security-assist-extension 1 facility"), >> FEAT_GROUP_INIT("msa2", MSA_EXT_2, "Message-security-assist-extension 2 facility"), >> diff --git a/target/s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h >> index 4d930871b4..7c5915c7b2 100644 >> --- a/target/s390x/cpu_features_def.h >> +++ b/target/s390x/cpu_features_def.h >> @@ -151,8 +151,12 @@ typedef enum { >> S390_FEAT_PTFF_QPT, >> S390_FEAT_PTFF_QUI, >> S390_FEAT_PTFF_QTOU, >> + S390_FEAT_PTFF_QSIE, >> + S390_FEAT_PTFF_QTOUE, >> S390_FEAT_PTFF_STO, >> S390_FEAT_PTFF_STOU, >> + S390_FEAT_PTFF_STOE, >> + S390_FEAT_PTFF_STOUE, >> >> /* KMAC */ >> S390_FEAT_KMAC_DEA, >> diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c >> index 58b6ac484e..8c04ff913f 100644 >> --- a/target/s390x/gen-features.c >> +++ b/target/s390x/gen-features.c >> @@ -59,6 +59,12 @@ >> S390_FEAT_PTFF_QTOU, \ >> S390_FEAT_PTFF_STOU >> >> +#define S390_FEAT_GROUP_MEPOCH_PTFF \ >> + S390_FEAT_PTFF_QSIE, \ >> + S390_FEAT_PTFF_QTOUE, \ >> + S390_FEAT_PTFF_STOE, \ >> + S390_FEAT_PTFF_STOUE >> + >> #define S390_FEAT_GROUP_MSA \ >> S390_FEAT_MSA, \ >> S390_FEAT_KMAC_DEA, \ >> @@ -219,6 +225,9 @@ static uint16_t group_TOD_CLOCK_STEERING[] = { >> static uint16_t group_GEN13_PTFF[] = { >> S390_FEAT_GROUP_GEN13_PTFF, >> }; >> +static uint16_t group_MEPOCH_PTFF[] = { >> + S390_FEAT_GROUP_MEPOCH_PTFF, >> +}; >> static uint16_t group_MSA[] = { >> S390_FEAT_GROUP_MSA, >> }; >> @@ -665,6 +674,7 @@ static FeatGroupDefSpec FeatGroupDef[] = { >> FEAT_GROUP_INITIALIZER(PLO), >> FEAT_GROUP_INITIALIZER(TOD_CLOCK_STEERING), >> FEAT_GROUP_INITIALIZER(GEN13_PTFF), >> + FEAT_GROUP_INITIALIZER(MEPOCH_PTFF), >> FEAT_GROUP_INITIALIZER(MSA), >> FEAT_GROUP_INITIALIZER(MSA_EXT_1), >> FEAT_GROUP_INITIALIZER(MSA_EXT_2), >> > > Guess this hunk is missing: > > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index 8c04ff913f..cfb371dac3 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -475,6 +475,7 @@ static uint16_t full_GEN14_GA1[] = { > S390_FEAT_CMM_NT, > S390_FEAT_HPMA2, > S390_FEAT_SIE_KSS, > + S390_FEAT_GROUP_MEPOCH_PTFF, > }; > > /* Default features (in order of release) > > > And we should most probably add this: Can you do a respin? I can then do a test on a z14. > > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > index bfd14723f1..deb870921b 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -2221,6 +2221,14 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) > return; > } > > + /* PTFF subfunctions might be indicated although kernel support missing */ > + if (!test_bit(S390_FEAT_MULTIPLE_EPOCH, model->features)) { > + clear_bit(S390_FEAT_PTFF_QSIE, model->features); > + clear_bit(S390_FEAT_PTFF_QTOUE, model->features); > + clear_bit(S390_FEAT_PTFF_STOE, model->features); > + clear_bit(S390_FEAT_PTFF_STOUE, model->features); > + } > + > /* with cpu model support, CMM is only indicated if really available */ > if (kvm_s390_cmma_available()) { > set_bit(S390_FEAT_CMM, model->features); > > > Unfortunately I don't have access to a z14. > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-02-05 9:59 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-02-05 9:09 [Qemu-devel] [PATCH] s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility David Hildenbrand 2018-02-05 9:31 ` no-reply 2018-02-05 9:34 ` David Hildenbrand 2018-02-05 9:58 ` Christian Borntraeger
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).