Commit f1a47d08 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/cpumodel: implement QMP interface "query-cpu-model-baseline" 



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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <20160905085244.99980-31-dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 4e82ef05

qapi-schema.json

+2 −1
Original line number Diff line number Diff line
@@ -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

target-s390x/cpu_models.c

+55 −0
Original line number Diff line number Diff line
@@ -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)