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 X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58EF4C43141 for ; Fri, 15 Nov 2019 06:10:26 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 27CA0207DD for ; Fri, 15 Nov 2019 06:10:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rg5bxtpI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27CA0207DD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVUoL-0004yM-9z for qemu-devel@archiver.kernel.org; Fri, 15 Nov 2019 01:10:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58397) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVUnd-0004VJ-PA for qemu-devel@nongnu.org; Fri, 15 Nov 2019 01:09:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVUnc-0005do-HZ for qemu-devel@nongnu.org; Fri, 15 Nov 2019 01:09:41 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:33185) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iVUnc-0005dT-BU for qemu-devel@nongnu.org; Fri, 15 Nov 2019 01:09:40 -0500 Received: by mail-pl1-x643.google.com with SMTP id ay6so3911611plb.0 for ; Thu, 14 Nov 2019 22:09:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LVqzV8tLnk+0CWhsZn8dhcU+MYaathjQ0Eug+EgFAcQ=; b=Rg5bxtpIuWh0laJscM3MEGgO5D/mYa/5ssQTDfJo2wNaDth5lS5hra6gpzB80k5IgK 4/pKozrFqmwuJUrdHPxPmSPeHwQNHxCl5vE6KfK/gJ1uGZ3LEq7ayr/fxkI9iI/Hyazv Pz+2VvtTdWug0EcITPiOpsLV0OJt0GziqAxSaEv5B0ORtlNjrcV3djD5XnBoJZTQjeWp otx3m+OMpdNo58FoX5UZjdaRj0RdaVxJIwr0eskaSH37nLkZauC7qG1o2DkNjhsdbSJA FSoUpTez/d+oBc8UdtifYVaTPbRDCVo/8bye8OTXYWj33oKYhz9lUjB0+pJiLMBDbg7b R32A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LVqzV8tLnk+0CWhsZn8dhcU+MYaathjQ0Eug+EgFAcQ=; b=IGBbl/zrJofqTC7aCu/S2ydArUDjTSf0kgFqz4EKP5XpgCP5KvV+SVBVjmkoc/SgI4 /QjwCCDLKt6xbTApP0IhEHqiCx1Fgi7sLwWk18l2iJ8AmhXQn5ICbg6cOWMvK0d6CkwX Nz0HEwopSSwwjqriiGhcsao6BvdyT3uGPC11E08aIY9mCXmAe03RvIBSvBbM9UwaOrZD Xjb7Ggqay3JjvPhi8qXLvajQ/NQzwM3ygDv+qWJcsdlyQu1aATdLFUteu6m9yOiJJIJo jWD55pX4wHIU6TDQZFa13HZylkV5lvfWIh6/VwXkcOSQTjqwlxKixmF00sWlq5qZd1S/ 7OaQ== X-Gm-Message-State: APjAAAXU21/VWZigf6QJehhMzpNwRHxJL8/3rt6v9QH9jD6mglSnQeoW S4zjL7wjHfcLVAmxaH953KZc0W/Ot2/xoA== X-Google-Smtp-Source: APXvYqzcZHnH4zaTiz88f4Fvl/L4Ps4Ag9Y2J9bpMbUYSHOfHdESSMOiuHQtvtCJFpyOZEIANH239w== X-Received: by 2002:a17:90a:ff02:: with SMTP id ce2mr17594828pjb.117.1573798178122; Thu, 14 Nov 2019 22:09:38 -0800 (PST) Received: from localhost.localdomain.com ([209.132.188.80]) by smtp.googlemail.com with ESMTPSA id r24sm10644284pgu.36.2019.11.14.22.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 22:09:37 -0800 (PST) From: Micky Yun Chan X-Google-Original-From: Micky Yun Chan To: qemu-devel@nongnu.org Subject: [PATCH] Implement backend program convention command for vhost-user-blk Date: Fri, 15 Nov 2019 14:09:25 +0800 Message-Id: <20191115060925.12346-1-michan@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michan , Micky Yun Chan , stefanha@redhat.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: michan Signed-off-by: Micky Yun Chan (michiboo) --- contrib/vhost-user-blk/vhost-user-blk.c | 95 +++++++++++++++---------- 1 file changed, 57 insertions(+), 38 deletions(-) diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c index ae61034656..435ddc46b2 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -576,70 +576,89 @@ vub_new(char *blk_file) return vdev_blk; } +static int opt_fdnum = -1; +static char *opt_socket_path; +static char *opt_blk_file; +static gboolean opt_print_caps; +static gboolean opt_read_only; + + +static GOptionEntry entries[] = { + { "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps, + "Print capabilities", NULL }, + { "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum, + "Use inherited fd socket", "FDNUM" }, + { "socket-path", 's', 0, G_OPTION_ARG_FILENAME, &opt_socket_path, + "Use UNIX socket path", "PATH" }, + {"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file, + "block device or file path", "PATH"}, + { "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only, + "Enable read-only", NULL } +}; + int main(int argc, char **argv) -{ - int opt; - char *unix_socket = NULL; - char *blk_file = NULL; - bool enable_ro = false; +{ int lsock = -1, csock = -1; VubDev *vdev_blk = NULL; + GError *error = NULL; + GOptionContext *context; - while ((opt = getopt(argc, argv, "b:rs:h")) != -1) { - switch (opt) { - case 'b': - blk_file = g_strdup(optarg); - break; - case 's': - unix_socket = g_strdup(optarg); - break; - case 'r': - enable_ro = true; - break; - case 'h': - default: - printf("Usage: %s [ -b block device or file, -s UNIX domain socket" - " | -r Enable read-only ] | [ -h ]\n", argv[0]); - return 0; - } + context = g_option_context_new(NULL); + g_option_context_add_main_entries(context, entries, NULL); + if (!g_option_context_parse(context, &argc, &argv, &error)) { + g_printerr("Option parsing failed: %s\n", error->message); + exit(EXIT_FAILURE); + } + if (opt_print_caps) { + g_print("{\n"); + g_print(" \"type\": \"blk\",\n"); + g_print(" \"features\": [\n"); + g_print(" \"blk-file\",\n"); + g_print(" \"read-only\"\n"); + g_print(" ]\n"); + g_print("}\n"); + exit(EXIT_SUCCESS); } - if (!unix_socket || !blk_file) { + if (!opt_blk_file) { printf("Usage: %s [ -b block device or file, -s UNIX domain socket" " | -r Enable read-only ] | [ -h ]\n", argv[0]); return -1; } - lsock = unix_sock_new(unix_socket); - if (lsock < 0) { - goto err; + if (opt_socket_path) { + lsock = unix_sock_new(opt_socket_path); + if (lsock < 0) { + exit(EXIT_FAILURE); + } + } else { + lsock = opt_fdnum; } - csock = accept(lsock, (void *)0, (void *)0); + csock = accept(lsock, NULL, NULL); if (csock < 0) { - fprintf(stderr, "Accept error %s\n", strerror(errno)); - goto err; + g_printerr("Accept error %s\n", strerror(errno)); + exit(EXIT_FAILURE); } - vdev_blk = vub_new(blk_file); + vdev_blk = vub_new(opt_blk_file); if (!vdev_blk) { - goto err; + exit(EXIT_FAILURE); } - if (enable_ro) { + if (opt_read_only) { vdev_blk->enable_ro = true; } if (!vug_init(&vdev_blk->parent, VHOST_USER_BLK_MAX_QUEUES, csock, vub_panic_cb, &vub_iface)) { - fprintf(stderr, "Failed to initialized libvhost-user-glib\n"); - goto err; + g_printerr("Failed to initialized libvhost-user-glib\n"); + exit(EXIT_FAILURE); } g_main_loop_run(vdev_blk->loop); + g_main_loop_unref(vdev_blk->loop); vug_deinit(&vdev_blk->parent); - -err: vub_free(vdev_blk); if (csock >= 0) { close(csock); @@ -647,8 +666,8 @@ err: if (lsock >= 0) { close(lsock); } - g_free(unix_socket); - g_free(blk_file); + g_free(opt_socket_path); + g_free(opt_blk_file); return 0; } -- 2.21.0