{"id":815734,"url":"http://patchwork.ozlabs.org/api/patches/815734/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-22-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919165226.23022-22-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:20","name":"[v2,21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3d23d5002411997b1c8f7dead01a08e2cb17d9b3","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-22-marcandre.lureau@redhat.com/mbox/","series":[{"id":3931,"url":"http://patchwork.ozlabs.org/api/series/3931/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3931","date":"2017-09-19T16:51:59","name":"vhost-user-scsi: code clean-up","version":2,"mbox":"http://patchwork.ozlabs.org/series/3931/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815734/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815734/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxVSN2f6Jz9sPm\n\tfor ;\n\tWed, 20 Sep 2017 03:37:24 +1000 (AEST)","from localhost ([::1]:44365 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMSY-0001kT-Az\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:37:22 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47519)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLn0-0006XD-EM\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:27 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLmw-0002kq-1A\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:26 -0400","from mx1.redhat.com ([209.132.183.28]:23856)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1duLmv-0002kI-PQ\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:21 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id BAFF05F7AD;\n\tTue, 19 Sep 2017 16:54:20 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 1A2625D980;\n\tTue, 19 Sep 2017 16:54:15 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com BAFF05F7AD","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:20 +0200","Message-Id":"<20170919165226.23022-22-marcandre.lureau@redhat.com>","In-Reply-To":"<20170919165226.23022-1-marcandre.lureau@redhat.com>","References":"<20170919165226.23022-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tTue, 19 Sep 2017 16:54:20 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 21/27] vhost-user-scsi: don't copy\n\tiscsi/scsi-lowlevel.h","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\tf4bug@amsat.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"There is no need to include hw/virtio/virtio-scsi.h, then the conflict\nwith SCSI_XFER enum goes away.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Philippe Mathieu-Daudé \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 96 +++----------------------------\n 1 file changed, 9 insertions(+), 87 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex c7f9d82142..cfac1ce1fe 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -12,8 +12,9 @@\n \n #include \"qemu/osdep.h\"\n #include \"contrib/libvhost-user/libvhost-user.h\"\n-#include \"hw/virtio/virtio-scsi.h\"\n+#include \"standard-headers/linux/virtio_scsi.h\"\n #include \"iscsi/iscsi.h\"\n+#include \"iscsi/scsi-lowlevel.h\"\n \n #include \n \n@@ -163,90 +164,11 @@ static void vus_gsrc_new(VusDev *vdev_scsi, int fd, GIOCondition cond,\n (gpointer)(uintptr_t)id);\n }\n \n-/* from libiscsi's scsi-lowlevel.h **\n- *\n- * nb. We can't directly include scsi-lowlevel.h due to a namespace conflict:\n- * QEMU's scsi.h also defines \"SCSI_XFER_NONE\".\n- */\n-\n-#define SCSI_CDB_MAX_SIZE 16\n-\n-struct scsi_iovector {\n- struct scsi_iovec *iov;\n- int niov;\n- int nalloc;\n- size_t offset;\n- int consumed;\n-};\n-\n-struct scsi_allocated_memory {\n- struct scsi_allocated_memory *next;\n- char buf[0];\n-};\n-\n-struct scsi_data {\n- int size;\n- unsigned char *data;\n-};\n-\n-enum scsi_sense_key {\n- SCSI_SENSE_NO_SENSE = 0x00,\n- SCSI_SENSE_RECOVERED_ERROR = 0x01,\n- SCSI_SENSE_NOT_READY = 0x02,\n- SCSI_SENSE_MEDIUM_ERROR = 0x03,\n- SCSI_SENSE_HARDWARE_ERROR = 0x04,\n- SCSI_SENSE_ILLEGAL_REQUEST = 0x05,\n- SCSI_SENSE_UNIT_ATTENTION = 0x06,\n- SCSI_SENSE_DATA_PROTECTION = 0x07,\n- SCSI_SENSE_BLANK_CHECK = 0x08,\n- SCSI_SENSE_VENDOR_SPECIFIC = 0x09,\n- SCSI_SENSE_COPY_ABORTED = 0x0a,\n- SCSI_SENSE_COMMAND_ABORTED = 0x0b,\n- SCSI_SENSE_OBSOLETE_ERROR_CODE = 0x0c,\n- SCSI_SENSE_OVERFLOW_COMMAND = 0x0d,\n- SCSI_SENSE_MISCOMPARE = 0x0e\n-};\n-\n-struct scsi_sense {\n- unsigned char error_type;\n- enum scsi_sense_key key;\n- int ascq;\n- unsigned sense_specific:1;\n- unsigned ill_param_in_cdb:1;\n- unsigned bit_pointer_valid:1;\n- unsigned char bit_pointer;\n- uint16_t field_pointer;\n-};\n-\n-enum scsi_residual {\n- SCSI_RESIDUAL_NO_RESIDUAL = 0,\n- SCSI_RESIDUAL_UNDERFLOW,\n- SCSI_RESIDUAL_OVERFLOW\n-};\n-\n-struct scsi_task {\n- int status;\n- int cdb_size;\n- int xfer_dir;\n- int expxferlen;\n- unsigned char cdb[SCSI_CDB_MAX_SIZE];\n- enum scsi_residual residual_status;\n- size_t residual;\n- struct scsi_sense sense;\n- struct scsi_data datain;\n- struct scsi_allocated_memory *mem;\n- void *ptr;\n-\n- uint32_t itt;\n- uint32_t cmdsn;\n- uint32_t lun;\n-\n- struct scsi_iovector iovector_in;\n- struct scsi_iovector iovector_out;\n-};\n-\n /** libiscsi integration **/\n \n+typedef struct virtio_scsi_cmd_req VirtIOSCSICmdReq;\n+typedef struct virtio_scsi_cmd_resp VirtIOSCSICmdResp;\n+\n static int vus_iscsi_add_lun(VusIscsiLun *lun, char *iscsi_uri)\n {\n struct iscsi_url *iscsi_url;\n@@ -365,12 +287,12 @@ static int handle_cmd_sync(struct iscsi_context *ctx,\n if (!out_len && !in_len) {\n dir = SCSI_XFER_NONE;\n } else if (out_len) {\n- dir = SCSI_XFER_TO_DEV;\n+ dir = SCSI_XFER_WRITE;\n for (i = 0; i < out_len; i++) {\n len += out[i].iov_len;\n }\n } else {\n- dir = SCSI_XFER_FROM_DEV;\n+ dir = SCSI_XFER_READ;\n for (i = 0; i < in_len; i++) {\n len += in[i].iov_len;\n }\n@@ -378,10 +300,10 @@ static int handle_cmd_sync(struct iscsi_context *ctx,\n \n task = scsi_task_new(cdb_len, req->cdb, dir, len);\n \n- if (dir == SCSI_XFER_TO_DEV) {\n+ if (dir == SCSI_XFER_WRITE) {\n task->iovector_out.iov = (struct scsi_iovec *)out;\n task->iovector_out.niov = out_len;\n- } else if (dir == SCSI_XFER_FROM_DEV) {\n+ } else if (dir == SCSI_XFER_READ) {\n task->iovector_in.iov = (struct scsi_iovec *)in;\n task->iovector_in.niov = in_len;\n }\n","prefixes":["v2","21/27"]}