Commit faa40177 authored by David Hildenbrand's avatar David Hildenbrand
Browse files

s390x/cpumodel: Prepare for changes of QEMU model 



Setup the 4.1 compatibility model so we can add new features to the
LATEST model.

Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
parent 3a06f981

hw/s390x/s390-virtio-ccw.c

+2 −0
Original line number Diff line number Diff line
@@ -650,7 +650,9 @@ DEFINE_CCW_MACHINE(4_2, "4.2", true); 


static void ccw_machine_4_1_instance_options(MachineState *machine)

{

    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V4_1 };

    ccw_machine_4_2_instance_options(machine);

    s390_set_qemu_cpu_model(0x2964, 13, 2, qemu_cpu_feat);

}



static void ccw_machine_4_1_class_options(MachineClass *mc)

target/s390x/gen-features.c

+5 −1
Original line number Diff line number Diff line
@@ -698,11 +698,14 @@ static uint16_t qemu_V4_0[] = { 
    S390_FEAT_ZPCI,

};



static uint16_t qemu_LATEST[] = {

static uint16_t qemu_V4_1[] = {

    S390_FEAT_STFLE_53,

    S390_FEAT_VECTOR,

};



static uint16_t qemu_LATEST[] = {

};



/* add all new definitions before this point */

static uint16_t qemu_MAX[] = {

    /* generates a dependency warning, leave it out for now */
@@ -824,6 +827,7 @@ static FeatGroupDefSpec QemuFeatDef[] = { 
    QEMU_FEAT_INITIALIZER(V2_11),

    QEMU_FEAT_INITIALIZER(V3_1),

    QEMU_FEAT_INITIALIZER(V4_0),

    QEMU_FEAT_INITIALIZER(V4_1),

    QEMU_FEAT_INITIALIZER(LATEST),

    QEMU_FEAT_INITIALIZER(MAX),

};