{"id":815714,"url":"http://patchwork.ozlabs.org/api/patches/815714/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-9-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-9-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:07","name":"[v2,08/27] vhost-user-scsi: code style fixes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2b71a2a8290c7bb9fcf1c4abf6a7d1d65954d01b","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-9-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/815714/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815714/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.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 3xxVF43WTkz9rvt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Sep 2017 03:27:36 +1000 (AEST)","from localhost ([::1]:44274 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1duMJ4-0001ZP-Gq\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:27:34 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46262)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <marcandre.lureau@redhat.com>) id 1duLlo-0005Un-1S\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:13 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <marcandre.lureau@redhat.com>) id 1duLlj-0001f5-Fm\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:12 -0400","from mx1.redhat.com ([209.132.183.28]:47754)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <marcandre.lureau@redhat.com>)\n\tid 1duLlj-0001eA-80\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:07 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 3C7C2C058EB4;\n\tTue, 19 Sep 2017 16:53:06 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id B644F600C2;\n\tTue, 19 Sep 2017 16:53:05 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3C7C2C058EB4","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:07 +0200","Message-Id":"<20170919165226.23022-9-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.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tTue, 19 Sep 2017 16:53:06 +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 08/27] vhost-user-scsi: code style fixes","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"pbonzini@redhat.com, felipe@nutanix.com, changpeng.liu@intel.com,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n\tf4bug@amsat.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nReviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 20 ++++++++++++--------\n 1 file changed, 12 insertions(+), 8 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex e01bf31296..fe567452cd 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -305,7 +305,8 @@ fail:\n }\n \n static struct scsi_task *scsi_task_new(int cdb_len, uint8_t *cdb, int dir,\n-                                       int xfer_len) {\n+                                       int xfer_len)\n+{\n     struct scsi_task *task;\n \n     assert(cdb_len > 0);\n@@ -344,7 +345,8 @@ static int handle_cmd_sync(struct iscsi_context *ctx,\n                            VirtIOSCSICmdReq *req,\n                            struct iovec *out, unsigned int out_len,\n                            VirtIOSCSICmdResp *rsp,\n-                           struct iovec *in, unsigned int in_len) {\n+                           struct iovec *in, unsigned int in_len)\n+{\n     struct scsi_task *task;\n     uint32_t dir;\n     uint32_t len;\n@@ -454,7 +456,8 @@ static void vus_panic_cb(VuDev *vu_dev, const char *buf)\n }\n \n static void vus_add_watch_cb(VuDev *vu_dev, int fd, int vu_evt, vu_watch_cb cb,\n-                             void *pvt) {\n+                             void *pvt)\n+{\n     vhost_scsi_dev_t *vdev_scsi;\n     guint id;\n \n@@ -529,7 +532,7 @@ static void vus_proc_req(VuDev *vu_dev, int idx)\n         return;\n     }\n \n-    if ((idx < 0) || (idx >= VHOST_MAX_NR_VIRTQUEUE)) {\n+    if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {\n         PERR(\"VQ Index out of range: %d\", idx);\n         vus_panic_cb(vu_dev, NULL);\n         return;\n@@ -556,8 +559,8 @@ static void vus_proc_req(VuDev *vu_dev, int idx)\n         }\n         PDBG(\"Popped elem@%p\", elem);\n \n-        assert(!((elem->out_num > 1) && (elem->in_num > 1)));\n-        assert((elem->out_num > 0) && (elem->in_num > 0));\n+        assert(!(elem->out_num > 1 && elem->in_num > 1));\n+        assert(elem->out_num > 0 && elem->in_num > 0);\n \n         if (elem->out_sg[0].iov_len < sizeof(VirtIOSCSICmdReq)) {\n             PERR(\"Invalid virtio-scsi req header\");\n@@ -593,7 +596,7 @@ static void vus_queue_set_started(VuDev *vu_dev, int idx, bool started)\n \n     assert(vu_dev);\n \n-    if ((idx < 0) || (idx >= VHOST_MAX_NR_VIRTQUEUE)) {\n+    if (idx < 0 || idx >= VHOST_MAX_NR_VIRTQUEUE) {\n         PERR(\"VQ Index out of range: %d\", idx);\n         vus_panic_cb(vu_dev, NULL);\n         return;\n@@ -748,7 +751,8 @@ err:\n }\n \n static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,\n-                                   char *iscsi_uri, uint32_t lun) {\n+                                   char *iscsi_uri, uint32_t lun)\n+{\n     assert(vdev_scsi);\n     assert(iscsi_uri);\n     assert(lun < VUS_MAX_LUNS);\n","prefixes":["v2","08/27"]}