{"id":815724,"url":"http://patchwork.ozlabs.org/api/patches/815724/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919165226.23022-16-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-16-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-19T16:52:14","name":"[v2,15/27] vhost-user-scsi: assert() in iscsi_add_lun()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fb55d3205d583f56dfcbfb2aa44e151779ac685c","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-16-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/815724/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815724/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 3xxVJQ3CJ4z9sMN\n\tfor ;\n\tWed, 20 Sep 2017 03:30:29 +1000 (AEST)","from localhost ([::1]:44286 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duMLr-00047w-VW\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 13:30:28 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47064)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duLmX-00068X-Ay\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:54:01 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duLmW-0002QL-JM\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:57 -0400","from mx1.redhat.com ([209.132.183.28]:60876)\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 1duLmW-0002PY-Dt\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 12:53:56 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 281965F7AE;\n\tTue, 19 Sep 2017 16:53:55 +0000 (UTC)","from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6A8A85C541;\n\tTue, 19 Sep 2017 16:53:47 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 281965F7AE","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 18:52:14 +0200","Message-Id":"<20170919165226.23022-16-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.16","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:53:55 +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 15/27] vhost-user-scsi: assert() in\n\tiscsi_add_lun()","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":"Instead of a preliminary check, add an assert to the function that has\nthe pre-condition.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Philippe Mathieu-Daudé \n---\n contrib/vhost-user-scsi/vhost-user-scsi.c | 6 +-----\n 1 file changed, 1 insertion(+), 5 deletions(-)","diff":"diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c\nindex dd0de1fc89..0573ae794e 100644\n--- a/contrib/vhost-user-scsi/vhost-user-scsi.c\n+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c\n@@ -257,6 +257,7 @@ static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri)\n \n assert(lun);\n assert(iscsi_uri);\n+ assert(!lun->iscsi_ctx);\n \n iscsi_ctx = iscsi_create_context(VUS_ISCSI_INITIATOR);\n if (!iscsi_ctx) {\n@@ -663,11 +664,6 @@ static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,\n assert(iscsi_uri);\n assert(lun < VUS_MAX_LUNS);\n \n- if (vdev_scsi->luns[lun].iscsi_ctx) {\n- PERR(\"Lun %d already configured\", lun);\n- return -1;\n- }\n-\n if (iscsi_add_lun(&vdev_scsi->luns[lun], iscsi_uri) != 0) {\n return -1;\n }\n","prefixes":["v2","15/27"]}