mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix linux-user vs. cpu models.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJY05u9AAoJEN7Pa5PG8C+v8UgP/jGTD656Cqn0N2X1XO1AivPl
 kBGx0BSeZ+VQaMC2IExatcSCrM4Al2TQXjwei5dmddm/NXkeLOjz/i2fktIcPz9o
 QpLQATQZrx+q0nhXRVlZoJbTzXlqVD6ZOf603FfHOy7EpOeCGH1LC0rtPzQQyRox
 SDUSUShfsk19JMXfoOc0X/0IOeMUTIuXdZjLcbDWqKf8Fd5CGmkS7GACEO6XpYlg
 Q0Zxf9aW5J7QeoFwv+2iZwSpTxfBfKO1Q/7FlRU4t+yiPW0pF6LPrBGcGIRv9ICk
 DPhox9mflc0r6QxduNjslmGQhsKQvJnHvXcguJ28Kp1F75u2JS/i8ZKl809UNdJs
 kuhTmHBuyi+/YdNVy4Xbzo5zgVAekdP2v8GKQ3xb3qzzMLdBSfj9oWv4Y/+TlIFN
 dDv3R7+l6kOPBcB7lN3cONi2u7ajkUl/U0fweic8Wg4s7crOkEiwcJb4rjigKgOp
 6oD2SbUFh4f3aCU/mhkoOxs7eOkCC4g/ffIw1nyk9aA24BpZfNQ6oUKaoQSV6fJs
 5OReZy0ssFdCfu2h/DcxockJbnC6w/pmHHiO38uC0XYQh8LZs91WlFBXKGoWHLZd
 xD17NOsZBbocaMgN8AhgSG166kYjU2rpiHwYeFz33PuQ78QVB5qOSHXcHGC28EuB
 F1meY2EfdZgaLcfpvLNr
 =LxY1
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-03-23 14:51:10 +00:00
commit 21c84c91f7
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/s390x/cpu_models.c
View File

@ -660,7 +660,6 @@ static void check_compatibility(const S390CPUModel *max_model,
static S390CPUModel *get_max_cpu_model(Error **errp) static S390CPUModel *get_max_cpu_model(Error **errp)
{ {
#ifndef CONFIG_USER_ONLY
static S390CPUModel max_model; static S390CPUModel max_model;
static bool cached; static bool cached;
@ -680,7 +679,6 @@ static S390CPUModel *get_max_cpu_model(Error **errp)
cached = true; cached = true;
return &max_model; return &max_model;
} }
#endif
return NULL; return NULL;
} }