Commit 21c84c91 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Fix linux-user vs. cpu models.

# gpg: Signature made Thu 23 Mar 2017 09:56:13 GMT
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170323:
  target/s390x: Fix broken user mode

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b79fbb2d a352aa62

target/s390x/cpu_models.c

+0 −2
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ static void check_compatibility(const S390CPUModel *max_model, 


static S390CPUModel *get_max_cpu_model(Error **errp)

{

#ifndef CONFIG_USER_ONLY

    static S390CPUModel max_model;

    static bool cached;
@@ -680,7 +679,6 @@ static S390CPUModel *get_max_cpu_model(Error **errp) 
        cached = true;

        return &max_model;

    }

#endif

    return NULL;

}