From nobody Sat Apr 27 22:27:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1574301588; cv=none; d=zoho.com; s=zohoarc; b=kzkawOcBfnrrKj/7SisnHwMj1VvhJ6B3e4fCST0k31W8IC0/M0lz7JHUqqtV6Ycpuo/L3bj3rocvyxf/Cj6bi5KKS0/JZalnWo2zcnnu5dQNCyJh0dXocl157UlGmdwL9x7y/Y5PEnXpAp7qcuKI7K9TwNTgzTz0NTVuz/TDAbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574301588; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=2bPS3l6qosJLcQHnJU5c1uNlHSfsXEoNeQoJGehvdFg=; b=CrDuf2kUE+jVCetYl1MWvwwEqt6s9E9lnwVEzoX+OT5EAguXXoYrR9/u4STEvcUlF/XKbEMFdLLwHbbd3ZjJ20YtHifcgq0XvbLPLK4okBp1WD9DjrPawDuxOEhIDf6X3Xp5uF1yAQQR4Ihk7yjnQjRSQ/3d+kZW8PL2Bo2cNUg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574301588371991.9339037899116; Wed, 20 Nov 2019 17:59:48 -0800 (PST) Received: from localhost ([::1]:35720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXbky-0001AT-Dh for importer@patchew.org; Wed, 20 Nov 2019 20:59:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40231) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXbk5-0000jD-76 for qemu-devel@nongnu.org; Wed, 20 Nov 2019 20:58:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXbk3-0006EP-Nn for qemu-devel@nongnu.org; Wed, 20 Nov 2019 20:58:44 -0500 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:33834) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXbk3-0006E5-Fw for qemu-devel@nongnu.org; Wed, 20 Nov 2019 20:58:43 -0500 Received: by mail-pg1-x541.google.com with SMTP id z188so745283pgb.1 for ; Wed, 20 Nov 2019 17:58:43 -0800 (PST) Received: from localhost.localdomain.com ([209.132.188.80]) by smtp.googlemail.com with ESMTPSA id i11sm720970pfq.74.2019.11.20.17.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2019 17:58:40 -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=2bPS3l6qosJLcQHnJU5c1uNlHSfsXEoNeQoJGehvdFg=; b=c6S4foCEWHRITnwmfhoDIWhCbvRony50M6nDtbB/ptHXe6wEOpPJV8Cw/df6fqsgke YjmT3wqiJmaWbgE081nvnFoLe6Y65/Wd2TPAsf9uXdiAGVUyMA+BwRYWfpIqkkgnoRyh X07IILsSWTO7OOgUBApDBE8+8ZgKM8hcWqXTP2v01sIZzqVaQ5jSEOC2b9baBjAMPIYm eyz0Gpnl6hKFW5QkEuMZo6u53DwKvx9lZUQvVpdgaowYTHnr00xkDAGrAPf+Z3nYE/8b UjJ0sodjHTCFLVtYlXO8SEQTgdkJG4GJEbrcm56mgz3P96Kj+7Y1pP1QXFknPh9nGmXX A95g== 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=2bPS3l6qosJLcQHnJU5c1uNlHSfsXEoNeQoJGehvdFg=; b=tN5OuOSa+qqPyW3jue/tvCTQwHQe19HP+xC/aQ+oHHeYt3fkUmLRblAPcyTbIUlu3H ePCwa3+TH0gz87PuhIZ8i7OTWN27inmdOwBxHIkdfgKiFXniKMZP0VYrWUSS9GexYcd3 cb/i7Ts271bsvAKItE/xSkm9ubOlr0MjO0v2c5/Rix47mZj+JcTh6xx0Yrc3GA/LBMsK psQesPqKUMrhXC0V8aMzN3kzttHAT/xc3WGitukCSCVl1/Dicb2aCoQgOwnaAIaxUqxR C4tQn0A+AzY+Ky80zvb5GQMVetin7NOSE8vk/aFcrnk1NCLfmWyL2Pe3PhRDde5xOp0k OEBQ== X-Gm-Message-State: APjAAAWTrHP05tW/P1p1ydmqiSQAGDMQ4/LXYCvDGkVz1w44OEMoyMl5 4fLDST76Q44RooDVpvAdbAbaI1kZO4T365V4 X-Google-Smtp-Source: APXvYqzyXHnWkxZFyduLwX+ermJvfSYtZyIapKhX1wgkyXnh5DgbmQ+IVjSfPmLSMeNJbqd4iXMLKQ== X-Received: by 2002:aa7:9639:: with SMTP id r25mr7586061pfg.17.1574301521278; Wed, 20 Nov 2019 17:58:41 -0800 (PST) From: Micky Yun Chan X-Google-Original-From: Micky Yun Chan To: qemu-devel@nongnu.org Subject: [PATCH v6] Implement backend program convention command for vhost-user-blk Date: Thu, 21 Nov 2019 09:58:26 +0800 Message-Id: <20191121015826.4867-1-michan@redhat.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: michan This patch is to add standard commands defined in docs/interop/vhost-user.r= st For vhost-user-* program Signed-off-by: Micky Yun Chan (michiboo) --- contrib/vhost-user-blk/vhost-user-blk.c | 108 ++++++++++++++---------- docs/interop/vhost-user.json | 31 +++++++ 2 files changed, 95 insertions(+), 44 deletions(-) diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-b= lk/vhost-user-blk.c index ae61034656..6fd91c7e99 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -576,70 +576,90 @@ vub_new(char *blk_file) return vdev_blk; } =20 +static int opt_fdnum =3D -1; +static char *opt_socket_path; +static char *opt_blk_file; +static gboolean opt_print_caps; +static gboolean opt_read_only; + +static GOptionEntry entries[] =3D { + { "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 =3D NULL; - char *blk_file =3D NULL; - bool enable_ro =3D false; int lsock =3D -1, csock =3D -1; VubDev *vdev_blk =3D NULL; + GError *error =3D NULL; + GOptionContext *context; =20 - while ((opt =3D getopt(argc, argv, "b:rs:h")) !=3D -1) { - switch (opt) { - case 'b': - blk_file =3D g_strdup(optarg); - break; - case 's': - unix_socket =3D g_strdup(optarg); - break; - case 'r': - enable_ro =3D true; - break; - case 'h': - default: - printf("Usage: %s [ -b block device or file, -s UNIX domain so= cket" - " | -r Enable read-only ] | [ -h ]\n", argv[0]); - return 0; + context =3D 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\": \"block\",\n"); + g_print(" \"features\": [\n"); + g_print(" \"read-only\",\n"); + g_print(" \"blk-file\"\n"); + g_print(" ]\n"); + g_print("}\n"); + exit(EXIT_SUCCESS); + } + + if (!opt_blk_file) { + g_print("%s\n", g_option_context_get_help(context, true, NULL)); + exit(EXIT_FAILURE); + } + + if (opt_socket_path) { + lsock =3D unix_sock_new(opt_socket_path); + 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 =3D opt_fdnum; } =20 - if (!unix_socket || !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 =3D unix_sock_new(unix_socket); - if (lsock < 0) { - goto err; - } - - csock =3D accept(lsock, (void *)0, (void *)0); + csock =3D 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); } =20 - vdev_blk =3D vub_new(blk_file); + vdev_blk =3D vub_new(opt_blk_file); if (!vdev_blk) { - goto err; + exit(EXIT_FAILURE); } - if (enable_ro) { + if (opt_read_only) { vdev_blk->enable_ro =3D true; } =20 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 initialize libvhost-user-glib\n"); + exit(EXIT_FAILURE); } =20 g_main_loop_run(vdev_blk->loop); - + g_main_loop_unref(vdev_blk->loop); + g_option_context_free(context); vug_deinit(&vdev_blk->parent); - -err: vub_free(vdev_blk); if (csock >=3D 0) { close(csock); @@ -647,8 +667,8 @@ err: if (lsock >=3D 0) { close(lsock); } - g_free(unix_socket); - g_free(blk_file); + g_free(opt_socket_path); + g_free(opt_blk_file); =20 return 0; } diff --git a/docs/interop/vhost-user.json b/docs/interop/vhost-user.json index da6aaf51c8..d25c3a957f 100644 --- a/docs/interop/vhost-user.json +++ b/docs/interop/vhost-user.json @@ -54,6 +54,37 @@ ] } =20 +## +# @VHostUserBackendBlockFeature: +# +# List of vhost user "block" features. +# +# @read-only: The --read-only command line option is supported. +# @blk-file: The --blk-file command line option is supported. +# +# Since: 4.0 +## +{ + 'enum': 'VHostUserBackendBlockFeature', + 'data': [ 'read-only', 'blk-file' ] +} + +## +# @VHostUserBackendCapabilitiesBlock: +# +# Capabilities reported by vhost user "block" backends +# +# @features: list of supported features. +# +# Since: 4.0 +## +{ + 'struct': 'VHostUserBackendCapabilitiesBlock', + 'data': { + 'features': [ 'VHostUserBackendBlockFeature' ] + } +} + ## # @VHostUserBackendInputFeature: # --=20 2.21.0