From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJCY-0007Zb-9h for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:41:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAJCR-0003hD-GI for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:41:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAJCR-0003gV-AX for qemu-devel@nongnu.org; Wed, 01 Jul 2015 10:41:19 -0400 From: Gerd Hoffmann Date: Wed, 1 Jul 2015 16:41:08 +0200 Message-Id: <1435761670-19520-24-git-send-email-kraxel@redhat.com> In-Reply-To: <1435761670-19520-1-git-send-email-kraxel@redhat.com> References: <1435761670-19520-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v3 23/25] virtio-scsi: 32bit cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: seabios@seabios.org Cc: Gerd Hoffmann , qemu-devel@nongnu.org, "Michael S. Tsirkin" Signed-off-by: Gerd Hoffmann --- src/hw/virtio-scsi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c index 6b4ed1a..cb825d4 100644 --- a/src/hw/virtio-scsi.c +++ b/src/hw/virtio-scsi.c @@ -53,10 +53,10 @@ virtio_scsi_cmd(struct vp_device *vp, struct vring_virtqueue *vq, int in_num = (datain ? 2 : 1); int out_num = (len ? 3 : 2) - in_num; - sg[0].addr = MAKE_FLATPTR(GET_SEG(SS), &req); + sg[0].addr = (void*)(&req); sg[0].length = sizeof(req); - sg[out_num].addr = MAKE_FLATPTR(GET_SEG(SS), &resp); + sg[out_num].addr = (void*)(&resp); sg[out_num].length = sizeof(resp); if (len) { @@ -93,10 +93,10 @@ virtio_scsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize) struct virtio_lun_s *vlun_gf = container_of(op->drive_gf, struct virtio_lun_s, drive); - return virtio_scsi_cmd(GET_GLOBALFLAT(vlun_gf->vp), - GET_GLOBALFLAT(vlun_gf->vq), op, cdbcmd, - GET_GLOBALFLAT(vlun_gf->target), - GET_GLOBALFLAT(vlun_gf->lun), + return virtio_scsi_cmd(vlun_gf->vp, + vlun_gf->vq, op, cdbcmd, + vlun_gf->target, + vlun_gf->lun, blocksize); } -- 1.8.3.1