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

s390x: add zPCI feature to "qemu" CPU model 



As we now always have PCI support, let's add it to the "qemu" CPU model,
taking care of backwards compatibility.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20190212112323.15904-1-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 965018be

hw/s390x/s390-virtio-ccw.c

+3 −0
Original line number Diff line number Diff line
@@ -657,7 +657,10 @@ DEFINE_CCW_MACHINE(4_0, "4.0", true); 


static void ccw_machine_3_1_instance_options(MachineState *machine)

{

    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 };

    ccw_machine_4_0_instance_options(machine);



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

}



static void ccw_machine_3_1_class_options(MachineClass *mc)

target/s390x/gen-features.c

+6 −2
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ static uint16_t qemu_V2_11[] = { 
    S390_FEAT_ZARCH,

};



static uint16_t qemu_LATEST[] = {

static uint16_t qemu_V3_1[] = {

    S390_FEAT_DAT_ENH,

    S390_FEAT_IDTE_SEGMENT,

    S390_FEAT_STFLE,
@@ -592,13 +592,16 @@ static uint16_t qemu_LATEST[] = { 
    S390_FEAT_MSA_EXT_4,

};



static uint16_t qemu_LATEST[] = {

    S390_FEAT_ZPCI,

};



/* add all new definitions before this point */

static uint16_t qemu_MAX[] = {

    /* z13+ features */

    S390_FEAT_STFLE_53,

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

    S390_FEAT_MSA_EXT_5,

    S390_FEAT_ZPCI,

};



/****** END FEATURE DEFS ******/
@@ -708,6 +711,7 @@ static FeatGroupDefSpec FeatGroupDef[] = { 
 *******************************/

static FeatGroupDefSpec QemuFeatDef[] = {

    QEMU_FEAT_INITIALIZER(V2_11),

    QEMU_FEAT_INITIALIZER(V3_1),

    QEMU_FEAT_INITIALIZER(LATEST),

    QEMU_FEAT_INITIALIZER(MAX),

};