[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [Patch v2 09/29] s390x/cpumodel: store the CPU model in the
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [Patch v2 09/29] s390x/cpumodel: store the CPU model in the CPU instance |
Date: |
Mon, 8 Aug 2016 17:32:38 +0200 |
A CPU model consists of a CPU definition, to which delta changes are
applied - features added or removed (e.g. z13-base,vx=on). In addition,
certain properties (e.g. cpu id) can later on change during migration
but belong into the CPU model. This data will later be filled from the
host model in the KVM case.
Therefore, store the configured CPU model inside the CPU instance, so
we can later on perform delta changes using properties.
For the "qemu" model, we emulate in TCG a z900. "host" will be
uninitialized (cpu->model == NULL) unless we have CPU model support in KVM
later on. The other models are all initialized from their definitions.
Only the "host" model can have a cpu->model == NULL.
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
target-s390x/cpu.h | 1 +
target-s390x/cpu_models.c | 26 ++++++++++++++++++++++++++
target-s390x/cpu_models.h | 10 ++++++++++
3 files changed, 37 insertions(+)
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 075bb37..3b76654 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -188,6 +188,7 @@ struct S390CPU {
CPUS390XState env;
int64_t id;
+ S390CPUModel *model;
/* needed for live migration */
void *irqstate;
uint32_t irqstate_saved_size;
diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c
index 8036b6e..f707a4b 100644
--- a/target-s390x/cpu_models.c
+++ b/target-s390x/cpu_models.c
@@ -153,6 +153,21 @@ void s390_realize_cpu_model(CPUState *cs, Error **errp)
static void s390_cpu_model_initfn(Object *obj)
{
+ S390CPU *cpu = S390_CPU(obj);
+ S390CPUClass *xcc = S390_CPU_GET_CLASS(cpu);
+
+ cpu->model = g_malloc0(sizeof(*cpu->model));
+ /* copy the model, so we can modify it */
+ cpu->model->def = xcc->cpu_def;
+ if (xcc->is_static) {
+ /* base model - features will never change */
+ bitmap_copy(cpu->model->features, cpu->model->def->base_feat,
+ S390_FEAT_MAX);
+ } else {
+ /* latest model - features can change */
+ bitmap_copy(cpu->model->features,
+ cpu->model->def->default_feat, S390_FEAT_MAX);
+ }
}
#ifdef CONFIG_KVM
@@ -163,10 +178,21 @@ static void s390_host_cpu_model_initfn(Object *obj)
static void s390_qemu_cpu_model_initfn(Object *obj)
{
+ S390CPU *cpu = S390_CPU(obj);
+
+ cpu->model = g_malloc0(sizeof(*cpu->model));
+ /* TCG emulates a z900 */
+ cpu->model->def = &s390_cpu_defs[0];
+ bitmap_copy(cpu->model->features, cpu->model->def->default_feat,
+ S390_FEAT_MAX);
}
static void s390_cpu_model_finalize(Object *obj)
{
+ S390CPU *cpu = S390_CPU(obj);
+
+ g_free(cpu->model);
+ cpu->model = NULL;
}
static bool get_is_migration_safe(Object *obj, Error **errp)
diff --git a/target-s390x/cpu_models.h b/target-s390x/cpu_models.h
index 13f7217..244256b 100644
--- a/target-s390x/cpu_models.h
+++ b/target-s390x/cpu_models.h
@@ -33,4 +33,14 @@ typedef struct S390CPUDef {
S390FeatBitmap full_feat;
} S390CPUDef;
+/* CPU model based on a CPU definition */
+typedef struct S390CPUModel {
+ const S390CPUDef *def;
+ S390FeatBitmap features;
+ /* values copied from the "host" model, can change during migration */
+ uint16_t lowest_ibc; /* lowest IBC that the hardware supports */
+ uint32_t cpu_id; /* CPU id */
+ uint8_t cpu_ver; /* CPU version, usually "ff" for kvm */
+} S390CPUModel;
+
#endif /* TARGET_S390X_CPU_MODELS_H */
--
2.6.6
- [Qemu-devel] [Patch v2 29/29] s390x/cpumodel: implement QMP interface "query-cpu-model-baseline", (continued)
- [Qemu-devel] [Patch v2 29/29] s390x/cpumodel: implement QMP interface "query-cpu-model-baseline", David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 08/29] s390x/cpumodel: register defined CPU models as subclasses, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 20/29] s390x/kvm: allow runtime-instrumentation for "none" machine, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 28/29] s390x/cpumodel: implement QMP interface "query-cpu-model-comparison", David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 23/29] s390x/kvm: let the CPU model control CMM(A), David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 27/29] s390x/cpumodel: implement QMP interface "query-cpu-model-expansion", David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 14/29] s390x/sclp: introduce sclp feature blocks, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 16/29] s390x/sclp: propagate the ibc val(lowest and unblocked ibc), David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 19/29] linux-headers: update against kvm/next, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 13/29] s390x/sclp: factor out preparation of cpu entries, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 09/29] s390x/cpumodel: store the CPU model in the CPU instance,
David Hildenbrand <=
- [Qemu-devel] [Patch v2 21/29] s390x/kvm: implement CPU model support, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 22/29] s390x/kvm: disable host model for existing compat machines, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 25/29] qmp: add QMP interface "query-cpu-model-comparison", David Hildenbrand, 2016/08/08
- Re: [Qemu-devel] [Patch v2 00/29] s390x CPU models: exposing features, no-reply, 2016/08/08
- Message not available
- Message not available
- Re: [Qemu-devel] [Patch v2 00/29] s390x CPU models: exposing features, David Hildenbrand, 2016/08/15