aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2015-07-01 14:38:59 +0200
committerGerd Hoffmann <kraxel@redhat.com>2015-07-01 16:35:50 +0200
commitb7dd90f067de0e9a1296da882d290a1da2fdb28b (patch)
tree9ccc54922987f258a53ae2b85cfea0c85ac599ab
parentef459e4e191cd73833d4f2eeb3f394833ebb7c1a (diff)
downloadseabios-b7dd90f067de0e9a1296da882d290a1da2fdb28b.tar.gz
virtio-scsi: 32bit cleanup
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--src/hw/virtio-scsi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/hw/virtio-scsi.c b/src/hw/virtio-scsi.c
index 6b4ed1ac..cb825d43 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);
}