[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 10/15] target-s390x: Prepare accelerator during c
From: |
Michael Mueller |
Subject: |
[Qemu-devel] [PATCH v4 10/15] target-s390x: Prepare accelerator during cpu object realization |
Date: |
Mon, 30 Mar 2015 16:28:23 +0200 |
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 <address@hidden>
---
target-s390x/cpu-models.c | 37 +++++++++++++++++++++++++++++++++++++
target-s390x/cpu-models.h | 4 ++++
target-s390x/cpu.c | 1 +
3 files changed, 42 insertions(+)
diff --git a/target-s390x/cpu-models.c b/target-s390x/cpu-models.c
index 8a877d3..ba873ea 100644
--- a/target-s390x/cpu-models.c
+++ b/target-s390x/cpu-models.c
@@ -111,6 +111,7 @@ typedef struct ParmAddrAddrModeMask {
} ParmAddrAddrModeMask;
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)
@@ -670,3 +671,39 @@ uint64_t *s390_current_fac_list_mask(void)
return s390_fac_list_mask_by_machine(mc->name);
}
#endif
+
+/**
+ * s390_cpu_model_init:
+ * @cc: S390 CPU class
+ *
+ * This function intitializes the current accelerator with processor
+ * related properties.
+ *
+ * Since: 2.4
+ */
+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[ACCEL_CURRENT],
+ FAC_LIST_CPU_S390_SIZE_UINT1);
+
+ if (kvm_enabled()) {
+ if (!kvm_s390_set_processor_props(&proc)) {
+ cpu_models_used = true;
+ }
+ }
+}
diff --git a/target-s390x/cpu-models.h b/target-s390x/cpu-models.h
index 9562088..fe3997f 100644
--- a/target-s390x/cpu-models.h
+++ b/target-s390x/cpu-models.h
@@ -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)
@@ -108,6 +111,7 @@ void s390_cpu_list_entry(gpointer data, gpointer user_data);
bool s390_cpu_classes_initialized(void);
uint64_t *s390_fac_list_mask_by_machine(const char *name);
uint64_t *s390_current_fac_list_mask(void);
+void s390_cpu_model_init(S390CPUClass *cc);
extern uint64_t qemu_s390_fac_list_mask[];
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index c33f05e..829945d 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -180,6 +180,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)
--
1.8.3.1
- Re: [Qemu-devel] [PATCH v4 11/15] target-s390x: New QMP command query-cpu-model, (continued)
Re: [Qemu-devel] [PATCH v4 11/15] target-s390x: New QMP command query-cpu-model, Eric Blake, 2015/03/30
Re: [Qemu-devel] [PATCH v4 11/15] target-s390x: New QMP command query-cpu-model, Eduardo Habkost, 2015/03/31
[Qemu-devel] [PATCH v4 06/15] target-s390x: Add cpu model alias definition routines, Michael Mueller, 2015/03/30
[Qemu-devel] [PATCH v4 09/15] target-s390x: Add cpu class initialization routines, Michael Mueller, 2015/03/30
[Qemu-devel] [PATCH v4 03/15] target-s390x: Generate facility defines per cpu model, Michael Mueller, 2015/03/30
[Qemu-devel] [PATCH v4 08/15] target-s390x: Add KVM VM attribute interface for cpu models, Michael Mueller, 2015/03/30
[Qemu-devel] [PATCH v4 10/15] target-s390x: Prepare accelerator during cpu object realization,
Michael Mueller <=
[Qemu-devel] [PATCH v4 14/15] target-s390x: Introduce facility test routine, Michael Mueller, 2015/03/30
[Qemu-devel] [PATCH v4 15/15] target-s390x: Enable cpu model usage, Michael Mueller, 2015/03/30
[Qemu-devel] [PATCH v4 12/15] Add optional parameters to QMP command query-cpu-definitions, Michael Mueller, 2015/03/30