virtio_scsi.c (261149) | virtio_scsi.c (274819) |
---|---|
1/*- 2 * Copyright (c) 2012, Bryan Venteicher <bryanv@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 13 unchanged lines hidden (view full) --- 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27/* Driver for VirtIO SCSI devices. */ 28 29#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2012, Bryan Venteicher <bryanv@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 13 unchanged lines hidden (view full) --- 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27/* Driver for VirtIO SCSI devices. */ 28 29#include <sys/cdefs.h> |
30__FBSDID("$FreeBSD: head/sys/dev/virtio/scsi/virtio_scsi.c 261149 2014-01-25 07:01:51Z bryanv $"); | 30__FBSDID("$FreeBSD: head/sys/dev/virtio/scsi/virtio_scsi.c 274819 2014-11-21 21:01:24Z smh $"); |
31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/kernel.h> 35#include <sys/kthread.h> 36#include <sys/malloc.h> 37#include <sys/module.h> 38#include <sys/sglist.h> --- 1043 unchanged lines hidden (view full) --- 1082 1083 ccbh->status |= CAM_SIM_QUEUED; 1084 ccbh->ccbh_vtscsi_req = req; 1085 1086 virtqueue_notify(vq); 1087 1088 if (ccbh->timeout != CAM_TIME_INFINITY) { 1089 req->vsr_flags |= VTSCSI_REQ_FLAG_TIMEOUT_SET; | 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/kernel.h> 35#include <sys/kthread.h> 36#include <sys/malloc.h> 37#include <sys/module.h> 38#include <sys/sglist.h> --- 1043 unchanged lines hidden (view full) --- 1082 1083 ccbh->status |= CAM_SIM_QUEUED; 1084 ccbh->ccbh_vtscsi_req = req; 1085 1086 virtqueue_notify(vq); 1087 1088 if (ccbh->timeout != CAM_TIME_INFINITY) { 1089 req->vsr_flags |= VTSCSI_REQ_FLAG_TIMEOUT_SET; |
1090 callout_reset(&req->vsr_callout, ccbh->timeout * hz / 1000, 1091 vtscsi_timedout_scsi_cmd, req); | 1090 callout_reset_sbt(&req->vsr_callout, SBT_1MS * ccbh->timeout, 1091 0, vtscsi_timedout_scsi_cmd, req, 0); |
1092 } 1093 1094 vtscsi_dprintf_req(req, VTSCSI_TRACE, "enqueued req=%p ccb=%p\n", 1095 req, ccbh); 1096 1097 return (0); 1098} 1099 --- 1218 unchanged lines hidden --- | 1092 } 1093 1094 vtscsi_dprintf_req(req, VTSCSI_TRACE, "enqueued req=%p ccb=%p\n", 1095 req, ccbh); 1096 1097 return (0); 1098} 1099 --- 1218 unchanged lines hidden --- |