From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUYrd-0005Tw-0s for qemu-devel@nongnu.org; Tue, 02 Aug 2016 08:32:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUYrW-0007JP-VO for qemu-devel@nongnu.org; Tue, 02 Aug 2016 08:32:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUYrW-0007JJ-NU for qemu-devel@nongnu.org; Tue, 02 Aug 2016 08:31:58 -0400 References: <1470139155-53900-1-git-send-email-dahi@linux.vnet.ibm.com> <1470139155-53900-16-git-send-email-dahi@linux.vnet.ibm.com> From: Thomas Huth Message-ID: <18a1c449-bfc9-df6f-a545-4fb0d32b39ff@redhat.com> Date: Tue, 2 Aug 2016 14:31:53 +0200 MIME-Version: 1.0 In-Reply-To: <1470139155-53900-16-git-send-email-dahi@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [Patch v1 15/29] s390x/sclp: indicate sclp features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand , qemu-devel@nongnu.org Cc: ehabkost@redhat.com, borntraeger@de.ibm.com, fiuczy@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, imammedo@redhat.com, jdenemar@redhat.com, mimu@linux.vnet.ibm.com On 02.08.2016 13:59, David Hildenbrand wrote: > 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 > --- > 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 15d7114..3c126ee 100644 > --- a/hw/s390x/sclp.c > +++ b/hw/s390x/sclp.c > @@ -31,11 +31,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)); > } > } > > @@ -59,6 +62,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 3fe85fa..641aad0 100644 > --- a/target-s390x/cpu_models.c > +++ b/target-s390x/cpu_models.c > @@ -74,6 +74,20 @@ static const 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; > + } > + return s390_fill_feat_block(cpu->model->features, type, data); IMHO it's somewhat strange to write "return something()" in a function that has been declared as "void". I know GCC does not reject this, but anyway, I'd suggest to simply remove the "return" keyword here. Thomas