From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2446DC433FE for ; Fri, 1 Apr 2022 04:50:59 +0000 (UTC) Received: from localhost ([::1]:47992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na9FS-0004uL-QD for qemu-devel@archiver.kernel.org; Fri, 01 Apr 2022 00:50:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na9EI-0004EC-Dq for qemu-devel@nongnu.org; Fri, 01 Apr 2022 00:49:46 -0400 Received: from [2603:8080:1600:e3d:d0e8:de7:dda9:627f] (port=53188 helo=geekhouse) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na9EG-0002ad-Ux for qemu-devel@nongnu.org; Fri, 01 Apr 2022 00:49:46 -0400 Received: from geekhouse (localhost [127.0.0.1]) by geekhouse (8.15.2/8.15.2/Debian-10) with ESMTP id 2314nfmP006231; Thu, 31 Mar 2022 23:49:41 -0500 Received: (from sk@localhost) by geekhouse (8.15.2/8.15.2/Submit) id 2314neEH006226; Thu, 31 Mar 2022 23:49:40 -0500 From: Sakshi Kaushik To: qemu-devel@nongnu.org Subject: [PATCH] [PATCH RFC v2] Implements Backend Program conventions for vhost-user-scsi Date: Thu, 31 Mar 2022 23:48:15 -0500 Message-Id: <20220401044815.6158-1-sakshikaushik717@gmail.com> X-Mailer: git-send-email 2.17.1 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2603:8080:1600:e3d:d0e8:de7:dda9:627f (failed) Received-SPF: none client-ip=2603:8080:1600:e3d:d0e8:de7:dda9:627f; envelope-from=sk@geekhouse; helo=geekhouse X-Spam_score_int: 36 X-Spam_score: 3.6 X-Spam_bar: +++ X-Spam_report: (3.6 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, FSL_HELO_NON_FQDN_1=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, HELO_NO_DOMAIN=0.001, NML_ADSP_CUSTOM_MED=0.9, RDNS_NONE=0.793, SPF_NONE=0.001, SPOOFED_FREEMAIL=1.522, SPOOFED_FREEMAIL_NO_RDNS=0.001, SPOOF_GMAIL_MID=0.799, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@gmail.com, raphel.norwitz@nutanix.com, Sakshi Kaushik , mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Sakshi Kaushik --- contrib/vhost-user-scsi/vhost-user-scsi.c | 35 +++++++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c index 4f6e3e2a24..9bdc088ce8 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -353,6 +353,8 @@ fail: int main(int argc, char **argv) { + static int opt_fdnum = -1; + static gboolean opt_print_caps; VusDev *vdev_scsi = NULL; char *unix_fn = NULL; char *iscsi_uri = NULL; @@ -362,12 +364,18 @@ int main(int argc, char **argv) switch (opt) { case 'h': goto help; - case 'u': + case 's': unix_fn = g_strdup(optarg); break; case 'i': iscsi_uri = g_strdup(optarg); break; + case 'f': + opt_fdnum = g_strdup(optarg); + break; + case 'p': + opt_print_caps = g_strdup(optarg); + break; default: goto help; } @@ -376,9 +384,22 @@ int main(int argc, char **argv) goto help; } - lsock = unix_sock_new(unix_fn); - if (lsock < 0) { - goto err; + if (unix_fn) { + lsock = unix_sock_new(unix_fn); + if (lsock < 0) { + exit(EXIT_FAILURE); + } + } else if (opt_fdnum < 0) { + g_print("%s\n", g_option_context_get_help(context, true, NULL)); + exit(EXIT_FAILURE); + } else { + lsock = opt_fdnum; + } + + if (opt_print_caps) { + if (opt_print_caps["type"] != "scsi") { + goto err; + } } csock = accept(lsock, NULL, NULL); @@ -426,10 +447,12 @@ err: goto out; help: - fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n", + fprintf(stderr, "Usage: %s [ -s socket-path -i iscsi_uri -f fd -p print-capabilities ] | [ -h ]\n", argv[0]); - fprintf(stderr, " -u path to unix socket\n"); + fprintf(stderr, " -s path to unix socket\n"); fprintf(stderr, " -i iscsi uri for lun 0\n"); + fprintf(stderr, " -f fd, file-descriptor\n"); + fprintf(stderr, " -p denotes print-capabilities\n"); fprintf(stderr, " -h print help and quit\n"); goto err; -- 2.17.1