From nobody Thu May 2 21:49:53 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=1574130467; cv=none; d=zoho.com; s=zohoarc; b=UiQiOc/a6BvvPqPNucZCO9fVz3RsRIMFyv6Ar6OxTPFCOhccCn3ynrhOV4vYr2hEFMVVTIFvrm6MT4yNMV+LgnSkY6IXzLWhM+YZgH+w9n18WWAYhFcF0a0ULZ8ffabxgLW9CqNUi0rNrsmO2KPaB6Lgo8zZQ/YZ9hFQYwH7yp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574130467; 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=i2r/mOApj4LAQtxgh1li1SATnPX6DmW2po1B+XTx69E=; b=R45rxHSaUMYhPfkbCroNYCWX56w61vVXOtG7ENG9eKvCUVUiep/yXK3hnle63XltYrb1cpIWHpGGBE6r3C+sHMXLLZXSTXa+L86hC7MENv82mrJ2jOLKVJvQYMrnm6ZkpTL1VgtgI1z2KT+E7OPsFdp9C5YGNASL9St9W8p3u/I= 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 1574130467733725.7085527374556; Mon, 18 Nov 2019 18:27:47 -0800 (PST) Received: from localhost ([::1]:41076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWtF2-0008NF-JR for importer@patchew.org; Mon, 18 Nov 2019 21:27:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39278) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWtEG-0007an-M8 for qemu-devel@nongnu.org; Mon, 18 Nov 2019 21:26:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWtEF-0002od-Bx for qemu-devel@nongnu.org; Mon, 18 Nov 2019 21:26:56 -0500 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:40902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iWtEF-0002oX-4D for qemu-devel@nongnu.org; Mon, 18 Nov 2019 21:26:55 -0500 Received: by mail-pl1-x641.google.com with SMTP id e3so10882462plt.7 for ; Mon, 18 Nov 2019 18:26:55 -0800 (PST) Received: from localhost.localdomain.com ([209.132.188.80]) by smtp.googlemail.com with ESMTPSA id i2sm21912113pgt.34.2019.11.18.18.26.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 18:26:52 -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=i2r/mOApj4LAQtxgh1li1SATnPX6DmW2po1B+XTx69E=; b=MOKBYVcTOvhT4CJoT3QNDu5O0c3DNgwu52SL3u8ddPSJ3/aEcz7lAP49veU+7SoFEX +lIxFJtKm2KYl83GtYFTt5rFGs0I1Zp17AQF28JF8l6Y8CAsjOoPefB+dQiD9BtsQfHf gkGZIHw/Ik6ljsW2uOWMw3eClmBxex+LZfxCdZOclSY5QpJe1CG1GNzqnzacGEVoJaQb MNcz8fjf2GuBtQmAcPmPzEGJe6Ufwf2RNmXqMcRYuScOfL6KmNjHkI1kiBAwR6Cu/ay6 Ra/KZDCgij+rgeoPaIMeR9ZdzKKvwbsyzDix6QOI/0cZ7f7BBrLamKRkp0V2kNkouIpY mNZA== 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=i2r/mOApj4LAQtxgh1li1SATnPX6DmW2po1B+XTx69E=; b=EUsbeLJ4kfD80Xh9jOrmW+7U6E8phkYOYwq6/5SMnqI6aYwLSjQsw2NTitlq+FG08T APauDPcLnmtd60MLY195/meH7hz0834oTnXv8V/1iAcP+dMIsChNkaY0YqI3LY/9nbAx zlGhF74EVfQ0lqw5Cfuv0HKiilaudJmEZpmbtJ8drMaYdMS1t/aCW7deyYopT77o4vdk 4sj0MbJ4Eyuc0PZvv4Yq9Ik46f66tTQ/54iRo6OHO6SWYUne2CB7QKG/27Qpj1zxtwmO 0XeRkY24sDXJKUvoF8onfjTHk3gojCGRFs8q6ySg2LIBqrdGZiPUrQBh/qf1+8wkME3w z7dQ== X-Gm-Message-State: APjAAAWlX65wJMLBOtrz0jZ1VCH7sFeLgmsTCWJ3vyduhrCcALcyPpRC mIBFIDmfanHLxgeAlXISTJWtFKBvpy14S8jV X-Google-Smtp-Source: APXvYqyx+oCOkkk5OEdo/K/Ru7eppXdZqzmG1rPLaY0wDnx+ISlOUXaRXM1hyvZAwvdUXdzuW4mmmw== X-Received: by 2002:a17:90a:348c:: with SMTP id p12mr2910677pjb.105.1574130413428; Mon, 18 Nov 2019 18:26:53 -0800 (PST) From: Micky Yun Chan X-Google-Original-From: Micky Yun Chan To: qemu-devel@nongnu.org Subject: [PATCH v4] Implement backend program convention command for vhost-user-blk Date: Tue, 19 Nov 2019 10:26:40 +0800 Message-Id: <20191119022640.11021-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::641 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 | 109 ++++++++++++++---------- 1 file changed, 65 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..a226148bdc 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -576,70 +576,91 @@ 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\": \"blk\",\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 +668,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; } --=20 2.21.0