mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-04 19:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent b79fbb2d70 a352aa62a7
commit 21c84c91f7
1 changed files with 0 additions and 2 deletions
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;
} }