Commit 3041e3be authored by Alexander Yarygin's avatar Alexander Yarygin Committed by Cornelia Huck
Browse files

s390x/ipl: Add ssid field to IplParameterBlock 



Add the ssid field to the ipl parameter block struct and fill it when
necessary so the guest can use it.

Signed-off-by: default avatarAlexander Yarygin <yarygin@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 6aed9589

hw/s390x/ipl.c

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ static uint64_t s390_update_iplstate(S390IPLState *ipl) 
                cpu_to_be32(S390_IPLB_MIN_CCW_LEN - S390_IPLB_HEADER_LEN);

            ipl->iplb.pbt = S390_IPL_TYPE_CCW;

            ipl->iplb.ccw.devno = cpu_to_be16(ccw_dev->sch->devno);

            ipl->iplb.ccw.ssid = ccw_dev->sch->ssid & 3;

            ipl->iplb_valid = true;

            goto out;

        }

hw/s390x/ipl.h

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
#include "cpu.h"



struct IplBlockCcw {

    uint8_t  reserved0[86];

    uint8_t  reserved0[85];

    uint8_t  ssid;

    uint16_t devno;

    uint8_t  vm_flags;

    uint8_t  reserved3[3];

target-s390x/ioinst.c

+1 −0
Original line number Diff line number Diff line
@@ -509,6 +509,7 @@ static void ioinst_handle_chsc_scsc(ChscReq *req, ChscResp *res) 


    general_chars[0] = cpu_to_be32(0x03000000);

    general_chars[1] = cpu_to_be32(0x00059000);

    general_chars[3] = cpu_to_be32(0x00080000);



    chsc_chars[0] = cpu_to_be32(0x40000000);

    chsc_chars[3] = cpu_to_be32(0x00040000);