@@ -107,6 +107,7 @@ typedef struct ParmAddrAddrAccel {
} ParmAddrAddrAccel;
static GSList *s390_cpu_aliases;
+static bool cpu_models_used;
/* compare order of two cpu classes for ascending sort */
gint s390_cpu_class_asc_order_compare(gconstpointer a, gconstpointer b)
@@ -634,3 +635,38 @@ bool s390_probe_mode(void)
return false;
}
+/**
+ * s390_cpu_model_init:
+ * @cc: S390 CPU class
+ *
+ * This function intitializes the current accelerator with processor
+ * related properties.
+ *
+ * Since: 2.3
+ */
+void s390_cpu_model_init(S390CPUClass *cc)
+{
+ S390ProcessorProps proc;
+
+ /* none cpu model case */
+ if (!strcmp(object_class_get_name(OBJECT_CLASS(cc)), TYPE_S390_CPU)) {
+ return;
+ }
+
+ /* accelerator already prepared */
+ if (cpu_models_used) {
+ return;
+ }
+
+ proc.cpuid = cpuid(cc->proc);
+ proc.ibc = cc->proc.ibc;
+ bitmap_zero(proc.fac_list, FAC_LIST_ARCH_S390_SIZE_UINT1);
+ bitmap_copy(proc.fac_list, cc->fac_list, FAC_LIST_CPU_S390_SIZE_UINT1);
+
+ if (kvm_enabled()) {
+ if (!kvm_s390_set_processor_props(&proc)) {
+ cpu_models_used = true;
+ }
+ }
+}
+
@@ -45,6 +45,9 @@
#define type_cpuid(x) ((uint64_t)((x) & 0xffff) << 16)
#define id_cpuid(x) ((uint64_t)((x) & 0xffffff) << 32)
#define ver_cpuid(x) ((uint64_t)((x) & 0xff) << 56)
+#define cpuid(x) (ver_cpuid(x.ver) | \
+ id_cpuid(x.id) | \
+ type_cpuid(x.type))
#define oldest_ibc(x) (((uint32_t)(x) >> 16) & 0xfff)
#define newest_ibc(x) ((uint32_t)(x) & 0xfff)
@@ -110,6 +113,7 @@ gint s390_cpu_class_asc_order_compare(gconstpointer a, gconstpointer b);
void s390_cpu_list_entry(gpointer data, gpointer user_data);
bool s390_cpu_classes_initialized(void);
bool s390_probe_mode(void);
+void s390_cpu_model_init(S390CPUClass *cc);
/*
* bits 0-7 : CMOS generation
@@ -178,6 +178,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
CPUState *cs = CPU(dev);
S390CPUClass *scc = S390_CPU_GET_CLASS(dev);
+ s390_cpu_model_init(scc);
s390_cpu_gdb_init(cs);
qemu_init_vcpu(cs);
#if !defined(CONFIG_USER_ONLY)
This patch implements routine s390_cpu_model_init(). It is called by the realize function during instantiation of an cpu object. Its task is to initialize the current accelerator with the properties of the selected processor model. Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> --- target-s390x/cpu-models.c | 36 ++++++++++++++++++++++++++++++++++++ target-s390x/cpu-models.h | 4 ++++ target-s390x/cpu.c | 1 + 3 files changed, 41 insertions(+)