From patchwork Wed Jul 16 12:54:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 370750 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A750C14008B for ; Wed, 16 Jul 2014 22:59:51 +1000 (EST) Received: from localhost ([::1]:39337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7OoH-0005ag-Up for incoming@patchwork.ozlabs.org; Wed, 16 Jul 2014 08:59:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7Ojw-0007bN-DA for qemu-devel@nongnu.org; Wed, 16 Jul 2014 08:55:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7Ojk-0006Rv-Ns for qemu-devel@nongnu.org; Wed, 16 Jul 2014 08:55:20 -0400 Received: from mail-ig0-x22b.google.com ([2607:f8b0:4001:c05::22b]:38889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7Ojk-0006Ro-Ir for qemu-devel@nongnu.org; Wed, 16 Jul 2014 08:55:08 -0400 Received: by mail-ig0-f171.google.com with SMTP id l13so4081961iga.4 for ; Wed, 16 Jul 2014 05:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=f8EjKoTzJpeNttHKlLXrsC2m2iSM0tW1Nzlk8y/kIAY=; b=vgUac6ZHYgSWFYaFf1LBRUIh20+7GLT7f5RazT8MqYg63Ib4ZQCBzeUrJ4YqN990ME yMRUce1SLN70Yo2X+Gy6feEZ4UFNRrB31YlM66ZjwqGediXg1Ovln9LbVvPDHjTuvjZP QAFNkOcxxPTBZuV/8QqZexMxj19m+JZCmjsTuDUgzAmJ4q7mHS2g2SnIr+UrOyixWFTo kZNeaO0Q7gR+fx1fEqsl2YbI4nLpODC33Fdy3i6s1vkJWxdNoAU0S95j7VUt+1qrKajw bZYr0PLFGoOW3c8v5MyZ0YTbXxIQ6nCW0rX/UOitjRBFtxPBoWPBJ6p+i0fwPib1Cp9Z eW3g== X-Received: by 10.50.126.100 with SMTP id mx4mr15836256igb.1.1405515308080; Wed, 16 Jul 2014 05:55:08 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-37-116-204-163.cust.vodafonedsl.it. [37.116.204.163]) by mx.google.com with ESMTPSA id y11sm44481878igp.14.2014.07.16.05.55.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2014 05:55:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Jul 2014 14:54:50 +0200 Message-Id: <1405515290-12497-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405515290-12497-1-git-send-email-pbonzini@redhat.com> References: <1405515290-12497-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c05::22b Cc: TAMUKI Shoichi Subject: [Qemu-devel] [PATCH 5/5] virtio-scsi: implement parse_cdb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Enable passthrough of vendor-specific commands. Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 0eb069a..e8f4c0c 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -406,6 +406,29 @@ static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, virtio_scsi_complete_cmd_req(req); } +static int virtio_scsi_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, + uint8_t *buf, void *hba_private) +{ + VirtIOSCSIReq *req = hba_private; + + cmd->lba = -1; + cmd->len = MIN(VIRTIO_SCSI_CDB_SIZE, SCSI_CMD_BUF_SIZE); + memcpy(cmd->buf, buf, cmd->len); + + /* Extract the direction and mode directly from the request, for + * host device passthrough. + */ + cmd->xfer = req->qsgl.size; + if (cmd->xfer == 0) { + cmd->mode = SCSI_XFER_NONE; + } else if (iov_size(req->elem.in_sg, req->elem.in_num) > req->resp_size) { + cmd->mode = SCSI_XFER_FROM_DEV; + } else { + cmd->mode = SCSI_XFER_TO_DEV; + } + return 0; +} + static QEMUSGList *virtio_scsi_get_sg_list(SCSIRequest *r) { VirtIOSCSIReq *req = r->hba_private; @@ -658,6 +681,7 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = { .change = virtio_scsi_change, .hotplug = virtio_scsi_hotplug, .hot_unplug = virtio_scsi_hot_unplug, + .parse_cdb = virtio_scsi_parse_cdb, .get_sg_list = virtio_scsi_get_sg_list, .save_request = virtio_scsi_save_request, .load_request = virtio_scsi_load_request,