[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [Patch v3 30/30] s390x/cpumodel: implement QMP interface "q
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [Patch v3 30/30] s390x/cpumodel: implement QMP interface "query-cpu-model-baseline" |
Date: |
Wed, 24 Aug 2016 20:11:06 +0200 |
Let's implement that interface by reusing our conversion code and
lookup code for CPU definitions.
In order to find a compatible CPU model, we first detect the maximum
possible CPU generation and then try to find a maximum model, satisfying
all base features (not exceeding the maximum generation).
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
qapi-schema.json | 3 ++-
target-s390x/cpu_models.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index ddf921b..6673e89 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3283,7 +3283,8 @@
# global properties may affect expansion of CPU models. Using
# query-cpu-model-expansion while using these is not advised.
#
-# Some architectures may not support baselining CPU models.
+# Some architectures may not support baselining CPU models. s390x supports
+# baselining CPU models.
#
# Returns: a CpuModelBaselineInfo. Returns an error if baselining CPU models is
# not supported, if a model cannot be used, if a model contains
diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c
index cd37bb1..755d35a 100644
--- a/target-s390x/cpu_models.c
+++ b/target-s390x/cpu_models.c
@@ -534,6 +534,61 @@ CpuModelCompareInfo
*arch_query_cpu_model_comparison(CpuModelInfo *infoa,
}
return compare_info;
}
+
+CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *infoa,
+ CpuModelInfo *infob,
+ Error **errp)
+{
+ CpuModelBaselineInfo *baseline_info;
+ S390CPUModel modela, modelb, model;
+ uint16_t cpu_type;
+ uint8_t max_gen_ga;
+ uint8_t max_gen;
+
+ /* convert both models to our internal representation */
+ cpu_model_from_info(&modela, infoa, errp);
+ if (*errp) {
+ return NULL;
+ }
+
+ cpu_model_from_info(&modelb, infob, errp);
+ if (*errp) {
+ return NULL;
+ }
+
+ /* features both models support */
+ bitmap_and(model.features, modela.features, modelb.features,
S390_FEAT_MAX);
+
+ /* detect the maximum model not regarding features */
+ if (modela.def->gen == modelb.def->gen) {
+ if (modela.def->type == modelb.def->type) {
+ cpu_type = modela.def->type;
+ } else {
+ cpu_type = 0;
+ }
+ max_gen = modela.def->gen;
+ max_gen_ga = MIN(modela.def->ec_ga, modelb.def->ec_ga);
+ } else if (modela.def->gen > modelb.def->gen) {
+ cpu_type = modelb.def->type;
+ max_gen = modelb.def->gen;
+ max_gen_ga = modelb.def->ec_ga;
+ } else {
+ cpu_type = modela.def->type;
+ max_gen = modela.def->gen;
+ max_gen_ga = modela.def->ec_ga;
+ }
+
+ model.def = s390_find_cpu_def(cpu_type, max_gen, max_gen_ga,
+ model.features);
+ /* strip off features not part of the max model */
+ bitmap_and(model.features, model.features, model.def->full_feat,
+ S390_FEAT_MAX);
+
+ baseline_info = g_malloc0(sizeof(*baseline_info));
+ baseline_info->model = g_malloc0(sizeof(*baseline_info->model));
+ cpu_info_from_model(baseline_info->model, &model, true);
+ return baseline_info;
+}
#endif
static void check_consistency(const S390CPUModel *model)
--
2.6.6
- [Qemu-devel] [Patch v3 07/30] s390x/cpumodel: introduce CPU feature group definitions, (continued)
- [Qemu-devel] [Patch v3 07/30] s390x/cpumodel: introduce CPU feature group definitions, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 04/30] s390x/cpumodel: introduce CPU features, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 12/30] s390x/cpumodel: check and apply the CPU model, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 13/30] s390x/sclp: factor out preparation of cpu entries, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 22/30] s390x/kvm: disable host model for problematic compat machines, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 02/30] s390x/cpumodel: "host" and "qemu" as CPU subclasses, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 28/30] s390x/cpumodel: implement QMP interface "query-cpu-model-expansion", David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 29/30] s390x/cpumodel: implement QMP interface "query-cpu-model-comparison", David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 17/30] s390x/sclp: propagate the mha via sclp, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 11/30] s390x/cpumodel: let the CPU model handle feature checks, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 30/30] s390x/cpumodel: implement QMP interface "query-cpu-model-baseline",
David Hildenbrand <=
- [Qemu-devel] [Patch v3 03/30] s390x/cpumodel: expose CPU class properties, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 18/30] s390x/sclp: propagate hmfai, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 08/30] s390x/cpumodel: register defined CPU models as subclasses, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 27/30] qmp: add QMP interface "query-cpu-model-baseline", David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 26/30] qmp: add QMP interface "query-cpu-model-comparison", David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 24/30] s390x/kvm: don't enable key wrapping if msa3 is disabled, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 21/30] s390x/kvm: implement CPU model support, David Hildenbrand, 2016/08/24
- [Qemu-devel] [Patch v3 16/30] s390x/sclp: propagate the ibc val(lowest and unblocked ibc), David Hildenbrand, 2016/08/24