Revision 72aef731 hw/scsi-disk.c

b/hw/scsi-disk.c
70 70
    char *serial;
71 71
};
72 72

  
73
static SCSIDiskReq *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun)
73
static SCSIDiskReq *scsi_new_request(SCSIDiskState *s, uint32_t tag,
74
        uint32_t lun)
74 75
{
75 76
    SCSIRequest *req;
76 77
    SCSIDiskReq *r;
77 78

  
78
    req = scsi_req_alloc(sizeof(SCSIDiskReq), d, tag, lun);
79
    req = scsi_req_alloc(sizeof(SCSIDiskReq), &s->qdev, tag, lun);
79 80
    r = DO_UPCAST(SCSIDiskReq, req, req);
80
    r->iov.iov_base = qemu_memalign(512, SCSI_DMA_BUF_SIZE);
81
    r->iov.iov_base = qemu_blockalign(s->bs, SCSI_DMA_BUF_SIZE);
81 82
    return r;
82 83
}
83 84

  
......
939 940
    }
940 941
    /* ??? Tags are not unique for different luns.  We only implement a
941 942
       single lun, so this should not matter.  */
942
    r = scsi_new_request(d, tag, lun);
943
    r = scsi_new_request(s, tag, lun);
943 944
    outbuf = (uint8_t *)r->iov.iov_base;
944 945
    is_write = 0;
945 946
    DPRINTF("Command: lun=%d tag=0x%x data=0x%02x", lun, tag, buf[0]);

Also available in: Unified diff