Commit 9303ecb6 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cb320a07 d6645483

hw/s390x/ipl.c

+2 −1
Original line number Diff line number Diff line
@@ -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 {

hw/s390x/s390-virtio-ccw.c

+5 −1
Original line number Diff line number Diff line
@@ -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)