92 lines
3.3 KiB
Diff
92 lines
3.3 KiB
Diff
|
From 53053ea2e6c757e5d044655c8b61c485e0aad4ed Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 May 2020 05:53:59 -0400
|
||
|
|
Subject: [PATCH 17/42] s390/ipl: sync back loadparm
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <20200529055420.16855-18-thuth@redhat.com>
|
||
|
|
Patchwork-id: 97039
|
||
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 17/38] s390/ipl: sync back loadparm
|
||
|
|
Bugzilla: 1828317
|
||
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
|
||
|
|
From: Halil Pasic <pasic@linux.ibm.com>
|
||
|
|
|
||
|
|
We expose loadparm as a r/w machine property, but if loadparm is set by
|
||
|
|
the guest via DIAG 308, we don't update the property. Having a
|
||
|
|
disconnect between the guest view and the QEMU property is not nice in
|
||
|
|
itself, but things get even worse for SCSI, where under certain
|
||
|
|
circumstances (see 789b5a401b "s390: Ensure IPL from SCSI works as
|
||
|
|
expected" for details) we call s390_gen_initial_iplb() on resets
|
||
|
|
effectively overwriting the guest/user supplied loadparm with the stale
|
||
|
|
value.
|
||
|
|
|
||
|
|
Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
|
||
|
|
Fixes: 7104bae9de ("hw/s390x: provide loadparm property for the machine")
|
||
|
|
Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
||
|
|
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
Reviewed-by: Viktor Mihajlovski <mihajlov@linux.ibm.com>
|
||
|
|
Tested-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
||
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
||
|
|
Message-Id: <20200309133223.100491-1-pasic@linux.ibm.com>
|
||
|
|
[borntraeger@de.ibm.com: use reverse xmas tree]
|
||
|
|
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
(cherry picked from commit 0a01e082a428b921e48b5314881b1f23a7b0fe50)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/s390x/ipl.c | 25 +++++++++++++++++++++++++
|
||
|
|
1 file changed, 25 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
|
||
|
|
index 0b7548a549..f25339c503 100644
|
||
|
|
--- a/hw/s390x/ipl.c
|
||
|
|
+++ b/hw/s390x/ipl.c
|
||
|
|
@@ -529,6 +529,30 @@ static bool is_virtio_scsi_device(IplParameterBlock *iplb)
|
||
|
|
return is_virtio_ccw_device_of_type(iplb, VIRTIO_ID_SCSI);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void update_machine_ipl_properties(IplParameterBlock *iplb)
|
||
|
|
+{
|
||
|
|
+ Object *machine = qdev_get_machine();
|
||
|
|
+ Error *err = NULL;
|
||
|
|
+
|
||
|
|
+ /* Sync loadparm */
|
||
|
|
+ if (iplb->flags & DIAG308_FLAGS_LP_VALID) {
|
||
|
|
+ uint8_t *ebcdic_loadparm = iplb->loadparm;
|
||
|
|
+ char ascii_loadparm[8];
|
||
|
|
+ int i;
|
||
|
|
+
|
||
|
|
+ for (i = 0; i < 8 && ebcdic_loadparm[i]; i++) {
|
||
|
|
+ ascii_loadparm[i] = ebcdic2ascii[(uint8_t) ebcdic_loadparm[i]];
|
||
|
|
+ }
|
||
|
|
+ ascii_loadparm[i] = 0;
|
||
|
|
+ object_property_set_str(machine, ascii_loadparm, "loadparm", &err);
|
||
|
|
+ } else {
|
||
|
|
+ object_property_set_str(machine, "", "loadparm", &err);
|
||
|
|
+ }
|
||
|
|
+ if (err) {
|
||
|
|
+ warn_report_err(err);
|
||
|
|
+ }
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
void s390_ipl_update_diag308(IplParameterBlock *iplb)
|
||
|
|
{
|
||
|
|
S390IPLState *ipl = get_ipl_device();
|
||
|
|
@@ -536,6 +560,7 @@ void s390_ipl_update_diag308(IplParameterBlock *iplb)
|
||
|
|
ipl->iplb = *iplb;
|
||
|
|
ipl->iplb_valid = true;
|
||
|
|
ipl->netboot = is_virtio_net_device(iplb);
|
||
|
|
+ update_machine_ipl_properties(iplb);
|
||
|
|
}
|
||
|
|
|
||
|
|
IplParameterBlock *s390_ipl_get_iplb(void)
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|