From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0Var-00009o-1i for qemu-devel@nongnu.org; Wed, 11 May 2016 10:58:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0Vag-0007Kl-A4 for qemu-devel@nongnu.org; Wed, 11 May 2016 10:58:32 -0400 Received: from e06smtp05.uk.ibm.com ([195.75.94.101]:42073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0Vaf-0007K1-TS for qemu-devel@nongnu.org; Wed, 11 May 2016 10:58:22 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 11 May 2016 15:58:20 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id DC4E617D805F for ; Wed, 11 May 2016 15:59:14 +0100 (BST) Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u4BEwHpa25559320 for ; Wed, 11 May 2016 14:58:17 GMT Received: from d06av11.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u4BEwGkL000474 for ; Wed, 11 May 2016 08:58:17 -0600 From: Cornelia Huck Date: Wed, 11 May 2016 16:57:58 +0200 Message-Id: <1462978692-33738-7-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1462978692-33738-1-git-send-email-cornelia.huck@de.ibm.com> References: <1462978692-33738-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH v2 for-2.7 06/20] s390x/ipl: Add ssid field to IplParameterBlock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, agraf@suse.de, jfrei@linux.vnet.ibm.com, Alexander Yarygin , Cornelia Huck From: Alexander Yarygin 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 9a73820..2da0f1e 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 0b7f6cbe..9aa4d94 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 142ff93..f5498aa 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.6.6