diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2016-09-05 10:52:29 +0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-09-06 17:06:50 +0200 |
| commit | 4dd4200ee7b4bc4b383932720bc53accf85cc8b2 (patch) | |
| tree | 8fafb61d34c91e6c05c1188d84f6c7c90de7687c /hw/s390x/sclp.c | |
| parent | 1c07e01b61daeba0204ee14dd0e21ea0218d0578 (diff) | |
| download | qemu-4dd4200ee7b4bc4b383932720bc53accf85cc8b2.zip qemu-4dd4200ee7b4bc4b383932720bc53accf85cc8b2.tar.gz qemu-4dd4200ee7b4bc4b383932720bc53accf85cc8b2.tar.bz2 | |
s390x/sclp: indicate sclp features
We have three different blocks in the SCLP read-SCP information response
that indicate sclp features. Let's prepare propagation.
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <20160905085244.99980-16-dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw/s390x/sclp.c')
| -rw-r--r-- | hw/s390x/sclp.c | 9 |
1 files changed, 9 insertions, 0 deletions
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 | |