From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhB6X-0001Tv-Bh for qemu-devel@nongnu.org; Tue, 06 Sep 2016 03:47:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhB6N-0002IH-TL for qemu-devel@nongnu.org; Tue, 06 Sep 2016 03:47:37 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhB6N-0002Hd-Ig for qemu-devel@nongnu.org; Tue, 06 Sep 2016 03:47:27 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u867h6cL109221 for ; Tue, 6 Sep 2016 03:47:26 -0400 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 259r9e3t1a-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 06 Sep 2016 03:47:26 -0400 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Sep 2016 08:47:24 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id DCAC017D8056 for ; Tue, 6 Sep 2016 08:49:12 +0100 (BST) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u867lK6Y66191514 for ; Tue, 6 Sep 2016 07:47:20 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u867lKAM013848 for ; Tue, 6 Sep 2016 03:47:20 -0400 From: Cornelia Huck Date: Tue, 6 Sep 2016 09:46:56 +0200 In-Reply-To: <20160906074710.13495-1-cornelia.huck@de.ibm.com> References: <20160906074710.13495-1-cornelia.huck@de.ibm.com> Message-Id: <20160906074710.13495-25-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PULL 24/38] s390x/sclp: indicate sclp features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: borntraeger@de.ibm.com, agraf@suse.de, jfrei@linux.vnet.ibm.com, qemu-devel@nongnu.org, David Hildenbrand , Cornelia Huck From: David Hildenbrand We have three different blocks in the SCLP read-SCP information response that indicate sclp features. Let's prepare propagation. Acked-by: Cornelia Huck Signed-off-by: David Hildenbrand Message-Id: <20160905085244.99980-16-dahi@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck --- 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