[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/38] s390x/cpumodel: store the CPU model in the CPU
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 18/38] s390x/cpumodel: store the CPU model in the CPU instance |
Date: |
Tue, 6 Sep 2016 09:46:50 +0200 |
From: David Hildenbrand <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <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 4f14632..95601bc 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 25cfcea..5045aef 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 0b87134..f3f3f3c 100644
--- a/target-s390x/cpu_models.h
+++ b/target-s390x/cpu_models.h
@@ -39,4 +39,14 @@ typedef struct S390CPUDef {
S390FeatInit full_init;
} 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.9.3
- [Qemu-devel] [PULL 00/38] First set of s390x patches for 2.8, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 02/38] s390x/pci: return directly if create zpci failed, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 01/38] s390x: add compat machine for 2.8, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 18/38] s390x/cpumodel: store the CPU model in the CPU instance,
Cornelia Huck <=
- [Qemu-devel] [PULL 20/38] s390x/cpumodel: let the CPU model handle feature checks, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 19/38] s390x/cpumodel: expose features and feature groups as properties, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 08/38] linux-headers: update, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 12/38] s390x/cpumodel: expose CPU class properties, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 05/38] s390x: wrap flic savevm calls into vmstate, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 11/38] s390x/cpumodel: "host" and "qemu" as CPU subclasses, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 09/38] s390x/kvm: 2 byte software breakpoint support, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 06/38] s390x/ioinst: advertise fcs facility, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 14/38] s390x/cpumodel: generate CPU feature lists for CPU models, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 07/38] s390x/css: handle cssid 255 correctly, Cornelia Huck, 2016/09/06