Commit 0a01e082 authored by Halil Pasic's avatar Halil Pasic Committed by Christian Borntraeger
Browse files

s390/ipl: sync back loadparm 



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 789b5a40 "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: default avatarHalil Pasic <pasic@linux.ibm.com>
Fixes: 7104bae9 ("hw/s390x: provide loadparm property for the machine")
Reported-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarViktor Mihajlovski <mihajlov@linux.ibm.com>
Tested-by: default avatarMarc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20200309133223.100491-1-pasic@linux.ibm.com>
[borntraeger@de.ibm.com: use reverse xmas tree]
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 73987ee5

hw/s390x/ipl.c

+25 −0
Original line number Diff line number Diff line
@@ -538,6 +538,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();
@@ -545,6 +569,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)