diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-30 13:02:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-30 13:02:45 +0000 |
| commit | abf6e752e55b2f5afb48303429dea2db7c3a62de (patch) | |
| tree | 7b3e5988befbe144847239291fdd8104bdd06008 /target | |
| parent | 21dab18b53f37664c2046c5bba91b416705ccdf1 (diff) | |
| parent | 7a4ec18d117d74eedccdadca882331b928135465 (diff) | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20171030' into staging
s390x: fixups for 2.11
- missing \r in the BIOS console output
- CPU type name is now "s390x-cpu"
- fixup for the host-model on z14 and older machine versions
# gpg: Signature made Mon 30 Oct 2017 08:34:15 GMT
# gpg: using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C
* remotes/borntraeger/tags/s390x-20171030:
s390-*.img: update s390 bios with latest fixes
s390-ccw: print carriage return with new lines
s390x/kvm: use cpu model for gscb on compat machines
target/s390x: change CPU type name to "s390x-cpu"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/s390x/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target/s390x/cpu_models.c | 4 | ||||
| -rw-r--r-- | target/s390x/kvm.c | 2 | ||||
| -rw-r--r-- | target/s390x/machine.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h index 0510c49e07..b46217dc31 100644 --- a/target/s390x/cpu-qom.h +++ b/target/s390x/cpu-qom.h @@ -22,7 +22,7 @@ #include "qom/cpu.h" -#define TYPE_S390_CPU "s390-cpu" +#define TYPE_S390_CPU "s390x-cpu" #define S390_CPU_CLASS(klass) \ OBJECT_CLASS_CHECK(S390CPUClass, (klass), TYPE_S390_CPU) diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 9554f19eb4..c4c37b3b15 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -286,7 +286,7 @@ static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_data) details = "(migration-safe)"; } - /* strip off the -s390-cpu */ + /* strip off the -s390x-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0; (*s->cpu_fprintf)(s->file, "s390 %-15s %-35s %s\n", name, scc->desc, details); @@ -390,7 +390,7 @@ static void create_cpu_model_list(ObjectClass *klass, void *opaque) char *name = g_strdup(object_class_get_name(klass)); S390CPUClass *scc = S390_CPU_CLASS(klass); - /* strip off the -s390-cpu */ + /* strip off the -s390x-cpu */ g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0; info = g_new0(CpuDefinitionInfo, 1); info->name = name; diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 88f27d75b9..b03f583032 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -306,7 +306,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_ri = 1; } } - if (gs_allowed()) { + if (cpu_model_allowed()) { if (kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0) == 0) { cap_gs = 1; } diff --git a/target/s390x/machine.c b/target/s390x/machine.c index e1b7015d20..b78f326d3a 100644 --- a/target/s390x/machine.c +++ b/target/s390x/machine.c @@ -180,7 +180,7 @@ const VMStateDescription vmstate_exval = { static bool gscb_needed(void *opaque) { - return kvm_s390_get_gs(); + return s390_has_feat(S390_FEAT_GUARDED_STORAGE); } const VMStateDescription vmstate_gscb = { |