[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/11] virtio-scsi: add basic SCSI bus operation
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/11] virtio-scsi: add basic SCSI bus operation |
Date: |
Tue, 6 Dec 2011 12:01:31 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio-scsi.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 11 deletions(-)
diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c
index c86e15e..dbb4003 100644
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -128,6 +128,7 @@ typedef struct {
DeviceState *qdev;
VirtIOSCSIConf *conf;
+ SCSIBus bus;
VirtQueue *ctrl_vq;
VirtQueue *event_vq;
VirtQueue *cmd_vq;
@@ -156,6 +157,22 @@ typedef struct VirtIOSCSIReq {
} resp;
} VirtIOSCSIReq;
+static inline int virtio_scsi_get_lun(uint8_t *lun)
+{
+ return ((lun[2] << 8) | lun[3]) & 0x3FFF;
+}
+
+static inline SCSIDevice *virtio_scsi_device_find(VirtIOSCSI *s, uint8_t *lun)
+{
+ if (lun[0] != 1) {
+ return NULL;
+ }
+ if (lun[2] != 0 && !(lun[2] >= 0x40 && lun[2] < 0x80)) {
+ return NULL;
+ }
+ return scsi_device_find(&s->bus, 0, lun[1], virtio_scsi_get_lun(lun));
+}
+
static void virtio_scsi_complete_req(VirtIOSCSIReq *req)
{
VirtIOSCSI *s = req->dev;
@@ -240,6 +257,36 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev,
VirtQueue *vq)
}
}
+static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status,
+ int32_t resid)
+{
+ VirtIOSCSIReq *req = r->hba_private;
+
+ req->resp.cmd->response = VIRTIO_SCSI_S_OK;
+ req->resp.cmd->status = status;
+ if (req->resp.cmd->status == GOOD) {
+ req->resp.cmd->resid = resid;
+ if (resid) {
+ req->resp.cmd->response = VIRTIO_SCSI_S_UNDERRUN;
+ }
+ } else {
+ req->resp.cmd->resid = 0;
+ scsi_req_get_sense(r, req->resp.cmd->sense, VIRTIO_SCSI_SENSE_SIZE);
+ }
+ virtio_scsi_complete_req(req);
+}
+
+static void virtio_scsi_request_cancelled(SCSIRequest *r)
+{
+ VirtIOSCSIReq *req = r->hba_private;
+
+ if (!req) {
+ return;
+ }
+ req->resp.cmd->response = VIRTIO_SCSI_S_ABORTED;
+ virtio_scsi_complete_req(req);
+}
+
static void virtio_scsi_fail_cmd_req(VirtIOSCSIReq *req)
{
req->resp.cmd->response = VIRTIO_SCSI_S_FAILURE;
@@ -250,8 +297,10 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev,
VirtQueue *vq)
{
VirtIOSCSI *s = (VirtIOSCSI *)vdev;
VirtIOSCSIReq *req;
+ int n;
while ((req = virtio_scsi_pop_req(s, vq))) {
+ SCSIDevice *d;
int out_size, in_size;
if (req->elem.out_num < 1 || req->elem.in_num < 1) {
virtio_scsi_bad_req();
@@ -265,18 +314,32 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev,
VirtQueue *vq)
virtio_scsi_fail_cmd_req(req);
continue;
}
+
+ d = virtio_scsi_device_find(s, req->req.cmd->lun);
+ if (!d) {
+ req->resp.cmd->response = VIRTIO_SCSI_S_BAD_TARGET;
+ virtio_scsi_complete_req(req);
+ continue;
+ }
+ req->sreq = scsi_req_new(d, req->req.cmd->tag,
+ virtio_scsi_get_lun(req->req.cmd->lun),
+ req->req.cmd->cdb, req);
+
+ if (req->sreq->cmd.mode != SCSI_XFER_NONE) {
+ int req_mode =
+ (req->elem.in_num > 1 ? SCSI_XFER_FROM_DEV : SCSI_XFER_TO_DEV);
+
+ if (req->sreq->cmd.mode != req_mode) {
+ virtio_scsi_fail_cmd_req(req);
+ scsi_req_cancel(req->sreq);
+ continue;
+ }
+ }
- req->resp.cmd->resid = 0;
- req->resp.cmd->status_qualifier = 0;
- req->resp.cmd->status = CHECK_CONDITION;
- req->resp.cmd->sense_len = 4;
- req->resp.cmd->sense[0] = 0xf0; /* Fixed format current sense */
- req->resp.cmd->sense[1] = ILLEGAL_REQUEST;
- req->resp.cmd->sense[2] = 0x20;
- req->resp.cmd->sense[3] = 0x00;
- req->resp.cmd->response = VIRTIO_SCSI_S_OK;
-
- virtio_scsi_complete_req(req);
+ n = scsi_req_enqueue(req->sreq, &req->qsgl);
+ if (n) {
+ scsi_req_continue(req->sreq);
+ }
}
}
@@ -331,6 +394,16 @@ static void virtio_scsi_reset(VirtIODevice *vdev)
s->cdb_size = VIRTIO_SCSI_CDB_SIZE;
}
+static struct SCSIBusInfo virtio_scsi_scsi_info = {
+ .tcq = true,
+ .max_channel = VIRTIO_SCSI_MAX_CHANNEL,
+ .max_target = VIRTIO_SCSI_MAX_TARGET,
+ .max_lun = VIRTIO_SCSI_MAX_LUN,
+
+ .complete = virtio_scsi_command_complete,
+ .cancel = virtio_scsi_request_cancelled,
+};
+
VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf)
{
VirtIOSCSI *s;
@@ -355,6 +428,11 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev,
VirtIOSCSIConf *proxyconf)
s->cmd_vq = virtio_add_queue(&s->vdev, VIRTIO_SCSI_VQ_SIZE,
virtio_scsi_handle_cmd);
+ scsi_bus_new(&s->bus, dev, &virtio_scsi_scsi_info);
+ if (!dev->hotplugged) {
+ scsi_bus_legacy_handle_cmdline(&s->bus);
+ }
+
/* TODO savevm */
return &s->vdev;
--
1.7.7.1
- [Qemu-devel] [PATCH 00/11] virtio-scsi device model, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 01/11] qiov: prevent double free or use-after-free, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 04/11] dma-helpers: add accounting wrappers, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 06/11] scsi: add scatter/gather functionality, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 03/11] dma-helpers: add dma_buf_read and dma_buf_write, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 08/11] virtio-scsi: Add virtio-scsi stub device, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 05/11] scsi: pass residual amount to command_complete, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 09/11] virtio-scsi: Add basic request processing infrastructure, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 07/11] scsi-disk: enable scatter/gather functionality, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 10/11] virtio-scsi: add basic SCSI bus operation,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/11] virtio-scsi: process control queue requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 02/11] dma-helpers: make QEMUSGList target independent, Paolo Bonzini, 2011/12/06