[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/16] target-s390x: Prepare accelerator during c
From: |
Michael Mueller |
Subject: |
[Qemu-devel] [PATCH v3 12/16] target-s390x: Prepare accelerator during cpu object realization |
Date: |
Mon, 2 Mar 2015 13:44:04 +0100 |
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 | 36 ++++++++++++++++++++++++++++++++++++
target-s390x/cpu-models.h | 4 ++++
target-s390x/cpu.c | 1 +
3 files changed, 41 insertions(+)
diff --git a/target-s390x/cpu-models.c b/target-s390x/cpu-models.c
index 83e590a..c6c1771 100644
--- a/target-s390x/cpu-models.c
+++ b/target-s390x/cpu-models.c
@@ -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;
+ }
+ }
+}
+
diff --git a/target-s390x/cpu-models.h b/target-s390x/cpu-models.h
index aa81c9b..f3f914a 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)
@@ -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
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index c9200ee..2f4192e 100644
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -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)
--
1.8.3.1
- Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, (continued)
- Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, Andreas Färber, 2015/03/02
- Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, Michael Mueller, 2015/03/02
- Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, Andreas Färber, 2015/03/02
- Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, Michael Mueller, 2015/03/03
- Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, Eduardo Habkost, 2015/03/04
- Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, Michael Mueller, 2015/03/05
- Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, Eduardo Habkost, 2015/03/05
Re: [Qemu-devel] [PATCH v3 01/16] Introduce probe mode for machine type none, Eduardo Habkost, 2015/03/02
[Qemu-devel] [PATCH v3 03/16] Introduce stub routine cpu_desc_avail, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 12/16] target-s390x: Prepare accelerator during cpu object realization,
Michael Mueller <=
[Qemu-devel] [PATCH v3 13/16] target-s390x: New QMP command query-cpu-model, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 07/16] target-s390x: Define cpu model specific facility lists, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 11/16] target-s390x: Add cpu class initialization routines, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 06/16] target-s390x: Introduce cpu models, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 05/16] target-s390x: Generate facility defines per cpu model, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 02/16] Introduce option --probe to switch into probe mode, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 08/16] target-s390x: Add cpu model alias definition routines, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 09/16] target-s390x: Update linux-headers/asm-s390/kvm.h, Michael Mueller, 2015/03/02
[Qemu-devel] [PATCH v3 14/16] target-s390x: Extend QMP command query-cpu-definitions, Michael Mueller, 2015/03/02