Commit 08ef92d5 authored by David Hildenbrand's avatar David Hildenbrand
Browse files

s390x: Bump the "qemu" CPU model up to a stripped-down z13 



We don't care about the other two missing base features:
- S390_FEAT_DFP_PACKED_CONVERSION
- S390_FEAT_GROUP_GEN13_PTFF

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
parent c7f22b31

hw/s390x/s390-virtio-ccw.c

+2 −0
Original line number Diff line number Diff line
@@ -669,7 +669,9 @@ DEFINE_CCW_MACHINE(4_1, "4.1", true); 


static void ccw_machine_4_0_instance_options(MachineState *machine)

{

    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V4_0 };

    ccw_machine_4_1_instance_options(machine);

    s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);

}



static void ccw_machine_4_0_class_options(MachineClass *mc)

target/s390x/cpu_models.c

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static S390CPUDef s390_cpu_defs[] = { 
    CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),

};



#define QEMU_MAX_CPU_TYPE 0x2827

#define QEMU_MAX_CPU_GEN 12

#define QEMU_MAX_CPU_TYPE 0x2964

#define QEMU_MAX_CPU_GEN 13

#define QEMU_MAX_CPU_EC_GA 2

static const S390FeatInit qemu_max_cpu_feat_init = { S390_FEAT_LIST_QEMU_MAX };

static S390FeatBitmap qemu_max_cpu_feat;

target/s390x/gen-features.c

+7 −4
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static uint16_t qemu_V3_1[] = { 
    S390_FEAT_MSA_EXT_4,

};



static uint16_t qemu_LATEST[] = {

static uint16_t qemu_V4_0[] = {

    /*

     * Only BFP bits are implemented (HFP, DFP, PFPO and DIVIDE TO INTEGER not

     * implemented yet).
@@ -698,11 +698,13 @@ static uint16_t qemu_LATEST[] = { 
    S390_FEAT_ZPCI,

};



/* add all new definitions before this point */

static uint16_t qemu_MAX[] = {

    /* z13+ features */

static uint16_t qemu_LATEST[] = {

    S390_FEAT_STFLE_53,

    S390_FEAT_VECTOR,

};



/* add all new definitions before this point */

static uint16_t qemu_MAX[] = {

    /* generates a dependency warning, leave it out for now */

    S390_FEAT_MSA_EXT_5,

};
@@ -821,6 +823,7 @@ static FeatGroupDefSpec FeatGroupDef[] = { 
static FeatGroupDefSpec QemuFeatDef[] = {

    QEMU_FEAT_INITIALIZER(V2_11),

    QEMU_FEAT_INITIALIZER(V3_1),

    QEMU_FEAT_INITIALIZER(V4_0),

    QEMU_FEAT_INITIALIZER(LATEST),

    QEMU_FEAT_INITIALIZER(MAX),

};