From 3041e3bead8df443e5212ae8a608cbec81bc90bd Mon Sep 17 00:00:00 2001 From: Alexander Yarygin Date: Thu, 1 Oct 2015 20:21:33 +0300 Subject: [PATCH] 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: Alexander Yarygin Reviewed-by: David Hildenbrand Signed-off-by: Cornelia Huck --- hw/s390x/ipl.c | 1 + hw/s390x/ipl.h | 3 ++- target-s390x/ioinst.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 9a73820fd1..2da0f1eaef 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -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; } diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index 0b7f6cbecb..9aa4d942a7 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -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]; diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index 142ff93844..f5498aa023 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -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); -- 2.11.0