Commit 4dd4200e authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <20160905085244.99980-16-dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 1c07e01b

hw/s390x/sclp.c

+9 −0
Original line number Diff line number Diff line
@@ -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 |

target-s390x/cpu_models.c

+14 −0
Original line number Diff line number Diff line
@@ -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;

target-s390x/cpu_models.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */