[qemu-xen staging] s390x/protvirt: allow to IPL secure guests with -no-reboot

[patchbot@xxxxxxx]

commit d1bb69db4ceb6897ef6a17bf263146b53a123632
Author:     Christian Borntraeger <borntraeger@xxxxxxxxxx>
AuthorDate: Tue Jul 21 06:32:02 2020 -0400
Commit:     Cornelia Huck <cohuck@xxxxxxxxxx>
CommitDate: Fri Jul 24 08:35:22 2020 +0200

    s390x/protvirt: allow to IPL secure guests with -no-reboot
    
    Right now, -no-reboot prevents secure guests from running. This is
    correct from an implementation point of view, as we have modeled the
    transition from non-secure to secure as a program directed IPL. From
    a user perspective, this is not the behavior of least surprise.
    
    We should implement the IPL into protected mode similar to the
    functions that we use for kdump/kexec. In other words, we do not stop
    here when -no-reboot is specified on the command line. Like function 0
    or function 1, function 10 is not a classic reboot. For example, it
    can only be called once. Before calling it a second time, a real
    reboot/reset must happen in-between. So function code 10 is more or
    less a state transition reset, but not a "standard" reset or reboot.
    
    Fixes: 4d226deafc44 ("s390x: protvirt: Support unpack facility")
    Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
    Reviewed-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
    Reviewed-by: David Hildenbrand <david@xxxxxxxxxx>
    Acked-by: Viktor Mihajlovski <mihajlov@xxxxxxxxxxxxx>
    Message-Id: <20200721103202.30610-1-borntraeger@xxxxxxxxxx>
    [CH: tweaked description]
    Signed-off-by: Cornelia Huck <cohuck@xxxxxxxxxx>
---
 hw/s390x/ipl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 {
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging