From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08C87C3F2CD for ; Wed, 4 Mar 2020 15:35:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C687721741 for ; Wed, 4 Mar 2020 15:35:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gGRjgiME" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C687721741 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9W3q-0001zz-W9 for qemu-devel@archiver.kernel.org; Wed, 04 Mar 2020 10:35:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45288) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9W1l-0007Gd-Vh for qemu-devel@nongnu.org; Wed, 04 Mar 2020 10:33:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9W1k-0003za-Gp for qemu-devel@nongnu.org; Wed, 04 Mar 2020 10:33:41 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:59638 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9W1k-0003yc-5I for qemu-devel@nongnu.org; Wed, 04 Mar 2020 10:33:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583336019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ncXvKgCh7oNRxNDfr+HT+HXiEUoLIL65NXTlOR8SRiw=; b=gGRjgiME74yKTwWRkpZNZ0v4HWXqIWkrpoNSoOklTb1juQmP9QKf0uj38SKUNwBvPAYUjS rzKGlAYAmYb565v6OTDXOQ/j1CW7KWXXh1Ew3U7ginnTAcRXxcsGPpBywD65VJHKDnNnFP CYC//tVI6UN7rjbprOURzQnP72cDoSw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-151-CEQtzDW0P9CP5AxUZ6E2UQ-1; Wed, 04 Mar 2020 10:33:38 -0500 X-MC-Unique: CEQtzDW0P9CP5AxUZ6E2UQ-1 Received: by mail-wm1-f70.google.com with SMTP id y7so1006160wmd.4 for ; Wed, 04 Mar 2020 07:33:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lIsPttx7EyIfrKo8AXy0rWHmebp0Fo3V9l7UpmGnTwA=; b=B39ijL5C29EvWBywl8gro0Krh/Z5va27I0mB528UTq8iw90PBqf7EYFy2fXwTKGD0b 1/9KOdZkDIS/EQNtKzLMExxVE8jWig09AnQ5UISuDhhjnc2tXMJjP72JeO1LhTHU7LtA x17VlajcdVhq7nO632YW+0bUQwQph4Cn8hT0O8lejrTXjOLTzELX4gMHkGZrRt2Cz1C2 vb+851YG3x9WVt8LCbsnbsSeAID35fljngZYhWdjvwED1Y/SafJXrBclvUmE6bVbyqCk nJBFM3WEqnDWx1hdEjTDJNpV8/2zHjp+FmsRC1lfgrKBb5J8EwZZ5ycVEGIoBueFQpeS WBhg== X-Gm-Message-State: ANhLgQ0M+wLyoa9lQ9wyelEf6Jbv2gnIO2XQwZm4ZavlKzfji1ud91wu LIXKhKMEo6y8v7IQM+nF8Km+8wnWm2ULPy+RLvkTnr1pb9i8LStbqsEelY37DiZRBzSTmXgRGNQ fsxKO/1YJaFGaL+Q= X-Received: by 2002:adf:ee86:: with SMTP id b6mr4483540wro.282.1583336016764; Wed, 04 Mar 2020 07:33:36 -0800 (PST) X-Google-Smtp-Source: ADFU+vvDPT3fAJASBFYUhOP6MiWlX7Asqyk+TsRCO4jq26QmdxrKeTswAcy9CJXcU3BXH/gwzsK+2Q== X-Received: by 2002:adf:ee86:: with SMTP id b6mr4483519wro.282.1583336016489; Wed, 04 Mar 2020 07:33:36 -0800 (PST) Received: from localhost.localdomain (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id h10sm5165717wml.18.2020.03.04.07.33.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 07:33:36 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/5] hw/scsi/spapr_vscsi: Introduce req_ui() helper Date: Wed, 4 Mar 2020 16:33:10 +0100 Message-Id: <20200304153311.22959-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200304153311.22959-1-philmd@redhat.com> References: <20200304153311.22959-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , qemu-ppc@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Introduce the req_ui() helper which returns a pointer to the viosrp_iu union held in the vscsi_req structure. This simplifies the next patch. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/spapr_vscsi.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index 3cb5a38181..f1a0bbdc31 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -97,6 +97,12 @@ typedef struct { vscsi_req reqs[VSCSI_REQ_LIMIT]; } VSCSIState; =20 +static union viosrp_iu *req_iu(vscsi_req *req) +{ + return (union viosrp_iu *)req->iu.srp.reserved; +} + + static struct vscsi_req *vscsi_get_req(VSCSIState *s) { vscsi_req *req; @@ -121,7 +127,7 @@ static struct vscsi_req *vscsi_find_req(VSCSIState *s, = uint64_t srp_tag) =20 for (i =3D 0; i < VSCSI_REQ_LIMIT; i++) { req =3D &s->reqs[i]; - if (req->iu.srp.cmd.tag =3D=3D srp_tag) { + if (req_iu(req)->srp.cmd.tag =3D=3D srp_tag) { return req; } } @@ -188,7 +194,7 @@ static int vscsi_send_iu(VSCSIState *s, vscsi_req *req, req->crq.s.reserved =3D 0x00; req->crq.s.timeout =3D cpu_to_be16(0x0000); req->crq.s.IU_length =3D cpu_to_be16(length); - req->crq.s.IU_data_ptr =3D req->iu.srp.rsp.tag; /* right byte order */ + req->crq.s.IU_data_ptr =3D req_iu(req)->srp.rsp.tag; /* right byte ord= er */ =20 if (rc =3D=3D 0) { req->crq.s.status =3D VIOSRP_OK; @@ -224,7 +230,7 @@ static void vscsi_makeup_sense(VSCSIState *s, vscsi_req= *req, static int vscsi_send_rsp(VSCSIState *s, vscsi_req *req, uint8_t status, int32_t res_in, int32_t res_out) { - union viosrp_iu *iu =3D &req->iu; + union viosrp_iu *iu =3D req_iu(req); uint64_t tag =3D iu->srp.rsp.tag; int total_len =3D sizeof(iu->srp.rsp); uint8_t sol_not =3D iu->srp.cmd.sol_not; @@ -285,7 +291,7 @@ static int vscsi_fetch_desc(VSCSIState *s, struct vscsi= _req *req, unsigned n, unsigned buf_offset, struct srp_direct_buf *ret) { - struct srp_cmd *cmd =3D &req->iu.srp.cmd; + struct srp_cmd *cmd =3D &req_iu(req)->srp.cmd; =20 switch (req->dma_fmt) { case SRP_NO_DATA_DESC: { @@ -473,7 +479,7 @@ static int data_out_desc_size(struct srp_cmd *cmd) =20 static int vscsi_preprocess_desc(vscsi_req *req) { - struct srp_cmd *cmd =3D &req->iu.srp.cmd; + struct srp_cmd *cmd =3D &req_iu(req)->srp.cmd; =20 req->cdb_offset =3D cmd->add_cdb_len & ~3; =20 @@ -655,7 +661,7 @@ static void *vscsi_load_request(QEMUFile *f, SCSIReques= t *sreq) =20 static void vscsi_process_login(VSCSIState *s, vscsi_req *req) { - union viosrp_iu *iu =3D &req->iu; + union viosrp_iu *iu =3D req_iu(req); struct srp_login_rsp *rsp =3D &iu->srp.login_rsp; uint64_t tag =3D iu->srp.rsp.tag; =20 @@ -681,7 +687,7 @@ static void vscsi_process_login(VSCSIState *s, vscsi_re= q *req) =20 static void vscsi_inquiry_no_target(VSCSIState *s, vscsi_req *req) { - uint8_t *cdb =3D req->iu.srp.cmd.cdb; + uint8_t *cdb =3D req_iu(req)->srp.cmd.cdb; uint8_t resp_data[36]; int rc, len, alen; =20 @@ -770,7 +776,7 @@ static void vscsi_report_luns(VSCSIState *s, vscsi_req = *req) =20 static int vscsi_queue_cmd(VSCSIState *s, vscsi_req *req) { - union srp_iu *srp =3D &req->iu.srp; + union srp_iu *srp =3D &req_iu(req)->srp; SCSIDevice *sdev; int n, lun; =20 @@ -821,7 +827,7 @@ static int vscsi_queue_cmd(VSCSIState *s, vscsi_req *re= q) =20 static int vscsi_process_tsk_mgmt(VSCSIState *s, vscsi_req *req) { - union viosrp_iu *iu =3D &req->iu; + union viosrp_iu *iu =3D req_iu(req); vscsi_req *tmpreq; int i, lun =3D 0, resp =3D SRP_TSK_MGMT_COMPLETE; SCSIDevice *d; @@ -831,7 +837,8 @@ static int vscsi_process_tsk_mgmt(VSCSIState *s, vscsi_= req *req) fprintf(stderr, "vscsi_process_tsk_mgmt %02x\n", iu->srp.tsk_mgmt.tsk_mgmt_func); =20 - d =3D vscsi_device_find(&s->bus, be64_to_cpu(req->iu.srp.tsk_mgmt.lun)= , &lun); + d =3D vscsi_device_find(&s->bus, + be64_to_cpu(req_iu(req)->srp.tsk_mgmt.lun), &lun= ); if (!d) { resp =3D SRP_TSK_MGMT_FIELDS_INVALID; } else { @@ -842,7 +849,7 @@ static int vscsi_process_tsk_mgmt(VSCSIState *s, vscsi_= req *req) break; } =20 - tmpreq =3D vscsi_find_req(s, req->iu.srp.tsk_mgmt.task_tag); + tmpreq =3D vscsi_find_req(s, req_iu(req)->srp.tsk_mgmt.task_ta= g); if (tmpreq && tmpreq->sreq) { assert(tmpreq->sreq->hba_private); scsi_req_cancel(tmpreq->sreq); @@ -867,7 +874,8 @@ static int vscsi_process_tsk_mgmt(VSCSIState *s, vscsi_= req *req) =20 for (i =3D 0; i < VSCSI_REQ_LIMIT; i++) { tmpreq =3D &s->reqs[i]; - if (tmpreq->iu.srp.cmd.lun !=3D req->iu.srp.tsk_mgmt.lun) = { + if (req_iu(tmpreq)->srp.cmd.lun + !=3D req_iu(req)->srp.tsk_mgmt.lun) { continue; } if (!tmpreq->active || !tmpreq->sreq) { @@ -911,7 +919,7 @@ static int vscsi_process_tsk_mgmt(VSCSIState *s, vscsi_= req *req) =20 static int vscsi_handle_srp_req(VSCSIState *s, vscsi_req *req) { - union srp_iu *srp =3D &req->iu.srp; + union srp_iu *srp =3D &req_iu(req)->srp; int done =3D 1; uint8_t opcode =3D srp->rsp.opcode; =20 @@ -948,7 +956,7 @@ static int vscsi_send_adapter_info(VSCSIState *s, vscsi= _req *req) struct mad_adapter_info_data info; int rc; =20 - sinfo =3D &req->iu.mad.adapter_info; + sinfo =3D &req_iu(req)->mad.adapter_info; =20 #if 0 /* What for ? */ rc =3D spapr_vio_dma_read(&s->vdev, be64_to_cpu(sinfo->buffer), @@ -984,7 +992,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vscsi= _req *req) uint64_t buffer; int rc; =20 - vcap =3D &req->iu.mad.capabilities; + vcap =3D &req_iu(req)->mad.capabilities; req_len =3D len =3D be16_to_cpu(vcap->common.length); buffer =3D be64_to_cpu(vcap->buffer); if (len > sizeof(cap)) { @@ -1029,7 +1037,7 @@ static int vscsi_send_capabilities(VSCSIState *s, vsc= si_req *req) =20 static int vscsi_handle_mad_req(VSCSIState *s, vscsi_req *req) { - union mad_iu *mad =3D &req->iu.mad; + union mad_iu *mad =3D &req_iu(req)->mad; bool request_handled =3D false; uint64_t retlen =3D 0; =20 --=20 2.21.1