diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-27 17:25:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-27 17:25:06 +0100 |
| commit | 9303ecb658a0194560d1eecde165a1511223c2d8 (patch) | |
| tree | cb77c122304a49e2250bf4073bc51a22d139be6e /hw | |
| parent | cb320a07e6cb6e251f9aeb4bf57f99cc320eb8ea (diff) | |
| parent | d6645483285feaa0aa26fe2b0c3bac6989250d2f (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200727' into staging
fixes for protected virtualization and loadparm handling
# gpg: Signature made Mon 27 Jul 2020 15:01:32 BST
# gpg: using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg: issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [marginal]
# 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>" [marginal]
# gpg: aka "Cornelia Huck <cohuck@redhat.com>" [marginal]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20200727:
s390x/s390-virtio-ccw: fix loadparm property getter
s390x/protvirt: allow to IPL secure guests with -no-reboot
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/ipl.c | 3 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index d46b1f094f..3d2652d75a 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -630,7 +630,8 @@ void s390_ipl_reset_request(CPUState *cs, enum s390_reset reset_type) } } if (reset_type == S390_RESET_MODIFIED_CLEAR || - reset_type == S390_RESET_LOAD_NORMAL) { + reset_type == S390_RESET_LOAD_NORMAL || + reset_type == S390_RESET_PV) { /* ignore -no-reboot, send no event */ qemu_system_reset_request(SHUTDOWN_CAUSE_SUBSYSTEM_RESET); } else { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 8cc2f25d8a..403d30e13b 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -701,8 +701,12 @@ bool hpage_1m_allowed(void) static char *machine_get_loadparm(Object *obj, Error **errp) { S390CcwMachineState *ms = S390_CCW_MACHINE(obj); + char *loadparm_str; - return g_memdup(ms->loadparm, sizeof(ms->loadparm)); + /* make a NUL-terminated string */ + loadparm_str = g_memdup(ms->loadparm, sizeof(ms->loadparm) + 1); + loadparm_str[sizeof(ms->loadparm)] = 0; + return loadparm_str; } static void machine_set_loadparm(Object *obj, const char *val, Error **errp) |