62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
From 8b994757136780998e0dd1d41613d2006c0dbcf6 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Tue, 4 Aug 2020 10:16:04 -0400
|
|
Subject: [PATCH 4/4] s390x/protvirt: allow to IPL secure guests with
|
|
-no-reboot
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
Message-id: <20200804101604.6259-2-thuth@redhat.com>
|
|
Patchwork-id: 98126
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH 1/1] s390x/protvirt: allow to IPL secure guests with -no-reboot
|
|
Bugzilla: 1863034
|
|
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
|
From: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
|
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@de.ibm.com>
|
|
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Acked-by: Viktor Mihajlovski <mihajlov@linux.ibm.com>
|
|
Message-Id: <20200721103202.30610-1-borntraeger@de.ibm.com>
|
|
[CH: tweaked description]
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
(cherry picked from commit d1bb69db4ceb6897ef6a17bf263146b53a123632)
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
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 586d95b5b6..5b3ea990af 100644
|
|
--- a/hw/s390x/ipl.c
|
|
+++ b/hw/s390x/ipl.c
|
|
@@ -624,7 +624,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 {
|
|
--
|
|
2.27.0
|
|
|