Commit f89600f4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190709' into staging 



Fixes in cpu models, tcg, and vfio-ccw.

# gpg: Signature made Tue 09 Jul 2019 13:20:52 BST
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [unknown]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [unknown]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20190709:
  s390x/tcg: move fallthrough annotation
  s390: cpumodel: fix description for the new vector facility
  s390x/cpumodel: Set up CPU model for AQIC interception
  vfio-ccw: Test vfio_set_irq_signaling() return value

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a538626a 92b9afe4

hw/vfio/ccw.c

+2 −3
Original line number Diff line number Diff line
@@ -327,9 +327,8 @@ static void vfio_ccw_unregister_io_notifier(VFIOCCWDevice *vcdev) 
{

    Error *err = NULL;



    vfio_set_irq_signaling(&vcdev->vdev, VFIO_CCW_IO_IRQ_INDEX, 0,

                           VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err);

    if (err) {

    if (vfio_set_irq_signaling(&vcdev->vdev, VFIO_CCW_IO_IRQ_INDEX, 0,

                               VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err)) {

        error_reportf_err(err, VFIO_MSG_PREFIX, vcdev->vdev.name);

    }

target/s390x/cpu_features_def.inc.h

+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ DEF_FEAT(SEMAPHORE_ASSIST, "sema", STFL, 59, "Semaphore-assist facility") 
DEF_FEAT(TIME_SLICE_INSTRUMENTATION, "tsi", STFL, 60, "Time-slice Instrumentation facility")

DEF_FEAT(MISC_INSTRUCTION_EXT3, "minste3", STFL, 61, "Miscellaneous-Instruction-Extensions Facility 3")

DEF_FEAT(RUNTIME_INSTRUMENTATION, "ri", STFL, 64, "CPU runtime-instrumentation facility")

DEF_FEAT(AP_QUEUE_INTERRUPT_CONTROL, "apqi", STFL, 65, "AP-Queue interruption facility")

DEF_FEAT(ZPCI, "zpci", STFL, 69, "z/PCI facility")

DEF_FEAT(ADAPTER_EVENT_NOTIFICATION, "aen", STFL, 71, "General-purpose-adapter-event-notification facility")

DEF_FEAT(ADAPTER_INT_SUPPRESSION, "ais", STFL, 72, "General-purpose-adapter-interruption-suppression facility")
@@ -103,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil 
DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2")

DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)")

DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)")

DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector BCD enhancements facility 1")

DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility")

DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)")

DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")

target/s390x/cpu_models.c

+1 −0
Original line number Diff line number Diff line
@@ -818,6 +818,7 @@ static void check_consistency(const S390CPUModel *model) 
        { S390_FEAT_PTFF_QTOUE, S390_FEAT_MULTIPLE_EPOCH },

        { S390_FEAT_PTFF_STOE, S390_FEAT_MULTIPLE_EPOCH },

        { S390_FEAT_PTFF_STOUE, S390_FEAT_MULTIPLE_EPOCH },

        { S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL, S390_FEAT_AP },

    };

    int i;

target/s390x/gen-features.c

+1 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ static uint16_t full_GEN12_GA1[] = { 
    S390_FEAT_EDAT_2,

    S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,

    S390_FEAT_AP_QUERY_CONFIG_INFO,

    S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL,

    S390_FEAT_AP_FACILITIES_TEST,

    S390_FEAT_AP,

};

target/s390x/translate_vx.inc.c

+1 −1
Original line number Diff line number Diff line
@@ -577,8 +577,8 @@ static DisasJumpType op_vllez(DisasContext *s, DisasOps *o) 
            enr = 0;

            break;

        }

    default:

        /* fallthrough */

    default:

        gen_program_exception(s, PGM_SPECIFICATION);

        return DISAS_NORETURN;

    }