[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/38] s390x/sclp: indicate sclp features
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 24/38] s390x/sclp: indicate sclp features |
Date: |
Tue, 6 Sep 2016 09:46:56 +0200 |
From: David Hildenbrand <address@hidden>
We have three different blocks in the SCLP read-SCP information response
that indicate sclp features. Let's prepare propagation.
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/sclp.c | 9 +++++++++
target-s390x/cpu_models.c | 14 ++++++++++++++
target-s390x/cpu_models.h | 1 +
3 files changed, 24 insertions(+)
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index e88521c..844cdb9 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -36,11 +36,14 @@ static inline SCLPDevice *get_sclp_device(void)
static void prepare_cpu_entries(SCLPDevice *sclp, CPUEntry *entry, int count)
{
+ uint8_t features[SCCB_CPU_FEATURE_LEN] = { 0 };
int i;
+ s390_get_feat_block(S390_FEAT_TYPE_SCLP_CPU, features);
for (i = 0; i < count; i++) {
entry[i].address = i;
entry[i].type = 0;
+ memcpy(entry[i].features, features, sizeof(entry[i].features));
}
}
@@ -64,6 +67,12 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)
read_info->offset_cpu = cpu_to_be16(offsetof(ReadInfo, entries));
read_info->highest_cpu = cpu_to_be16(max_cpus);
+ /* Configuration Characteristic (Extension) */
+ s390_get_feat_block(S390_FEAT_TYPE_SCLP_CONF_CHAR,
+ read_info->conf_char);
+ s390_get_feat_block(S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT,
+ read_info->conf_char_ext);
+
prepare_cpu_entries(sclp, read_info->entries, cpu_count);
read_info->facilities = cpu_to_be64(SCLP_HAS_CPU_INFO |
diff --git a/target-s390x/cpu_models.c b/target-s390x/cpu_models.c
index 2401282..4ebf33e 100644
--- a/target-s390x/cpu_models.c
+++ b/target-s390x/cpu_models.c
@@ -74,6 +74,20 @@ static S390CPUDef s390_cpu_defs[] = {
CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"),
};
+void s390_get_feat_block(S390FeatType type, uint8_t *data)
+{
+ static S390CPU *cpu;
+
+ if (!cpu) {
+ cpu = S390_CPU(qemu_get_cpu(0));
+ }
+
+ if (!cpu || !cpu->model) {
+ return;
+ }
+ s390_fill_feat_block(cpu->model->features, type, data);
+}
+
bool s390_has_feat(S390Feat feat)
{
static S390CPU *cpu;
diff --git a/target-s390x/cpu_models.h b/target-s390x/cpu_models.h
index cca865d..b80883c 100644
--- a/target-s390x/cpu_models.h
+++ b/target-s390x/cpu_models.h
@@ -49,6 +49,7 @@ typedef struct S390CPUModel {
uint8_t cpu_ver; /* CPU version, usually "ff" for kvm */
} S390CPUModel;
+void s390_get_feat_block(S390FeatType type, uint8_t *data);
bool s390_has_feat(S390Feat feat);
#endif /* TARGET_S390X_CPU_MODELS_H */
--
2.9.3
- [Qemu-devel] [PULL 37/38] s390x/cpumodel: implement QMP interface "query-cpu-model-comparison", (continued)
- [Qemu-devel] [PULL 37/38] s390x/cpumodel: implement QMP interface "query-cpu-model-comparison", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 30/38] s390x/kvm: disable host model for problematic compat machines, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 33/38] qmp: add QMP interface "query-cpu-model-expansion", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 34/38] qmp: add QMP interface "query-cpu-model-comparison", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 16/38] s390x/cpumodel: introduce CPU feature group definitions, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 31/38] s390x/kvm: let the CPU model control CMM(A), Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 25/38] s390x/sclp: propagate the ibc val (lowest and unblocked ibc), Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 26/38] s390x/sclp: propagate the mha via sclp, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 22/38] s390x/sclp: factor out preparation of cpu entries, Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 24/38] s390x/sclp: indicate sclp features,
Cornelia Huck <=
- [Qemu-devel] [PULL 38/38] s390x/cpumodel: implement QMP interface "query-cpu-model-baseline", Cornelia Huck, 2016/09/06
- [Qemu-devel] [PULL 35/38] qmp: add QMP interface "query-cpu-model-baseline", Cornelia Huck, 2016/09/06
- Re: [Qemu-devel] [PULL 00/38] First set of s390x patches for 2.8, no-reply, 2016/09/06
- Re: [Qemu-devel] [PULL 00/38] First set of s390x patches for 2.8, Peter Maydell, 2016/09/06