From patchwork Mon Oct 21 10:58:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1180490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="GYOrD5HX"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 46xYnj6Gzfz9sP6 for ; Mon, 21 Oct 2019 22:10:01 +1100 (AEDT) Received: from localhost ([::1]:37976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVZX-0004nR-6n for incoming@patchwork.ozlabs.org; Mon, 21 Oct 2019 07:09:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46405) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMVPt-0003dm-PF for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMVPs-0003wa-GM for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:01 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:60264 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMVPs-0003wJ-Bq for qemu-devel@nongnu.org; Mon, 21 Oct 2019 07:00:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571655600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+O+R9BdeYeGrQ6yVk8iXo17XYj/kKSf2L9XLSL8w5V0=; b=GYOrD5HXtmvKDUpyP/pJ7FuTEtHoyyG0HR5aCsA2JNFsReKw4zJ055hNq/SgA4nwYr4li7 nTjRiF60NOqxvNMJrCQjWfSY6CGPNbHs7lI1Z0W+pvS+qoZdTLfmpHL1s04tHnmYM7QLRT s/l1RoZD54yVPcFjH7S56yAKfKBgJ14= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-m72oMF15M4-ccN_0XYcE2A-1; Mon, 21 Oct 2019 06:59:56 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A3EA107AD33; Mon, 21 Oct 2019 10:59:55 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFB2764026; Mon, 21 Oct 2019 10:59:53 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, mst@redhat.com, marcandre.lureau@redhat.com, stefanha@redhat.com Subject: [PATCH 13/30] virtiofsd: Add options for virtio Date: Mon, 21 Oct 2019 11:58:15 +0100 Message-Id: <20191021105832.36574-14-dgilbert@redhat.com> In-Reply-To: <20191021105832.36574-1-dgilbert@redhat.com> References: <20191021105832.36574-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: m72oMF15M4-ccN_0XYcE2A-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: piaojun@huawei.com, eguan@linux.alibaba.com, vgoyal@Redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" Add options to specify parameters for virtio-fs paths, i.e. ./virtiofsd -o vhost_user_socket=/tmp/vhostqemu Signed-off-by: Dr. David Alan Gilbert --- contrib/virtiofsd/fuse_i.h | 1 + contrib/virtiofsd/fuse_lowlevel.c | 10 +++++++--- contrib/virtiofsd/helper.c | 18 +++++++++--------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/contrib/virtiofsd/fuse_i.h b/contrib/virtiofsd/fuse_i.h index 6c3f432d0e..d65af06ff0 100644 --- a/contrib/virtiofsd/fuse_i.h +++ b/contrib/virtiofsd/fuse_i.h @@ -63,6 +63,7 @@ struct fuse_session { struct fuse_notify_req notify_list; size_t bufsize; int error; + char *vu_socket_path; }; struct fuse_chan { diff --git a/contrib/virtiofsd/fuse_lowlevel.c b/contrib/virtiofsd/fuse_lowlevel.c index 6fe7506ead..d47e4438f3 100644 --- a/contrib/virtiofsd/fuse_lowlevel.c +++ b/contrib/virtiofsd/fuse_lowlevel.c @@ -2064,6 +2064,8 @@ static const struct fuse_opt fuse_ll_opts[] = { LL_OPTION("-d", debug, 1), LL_OPTION("--debug", debug, 1), LL_OPTION("allow_root", deny_others, 1), + LL_OPTION("--socket-path=%s", vu_socket_path, 0), + LL_OPTION("vhost_user_socket=%s", vu_socket_path, 0), FUSE_OPT_END }; @@ -2078,9 +2080,11 @@ void fuse_lowlevel_help(void) /* These are not all options, but the ones that are potentially of interest to an end-user */ printf( -" -o allow_other allow access by all users\n" -" -o allow_root allow access by root\n" -" -o auto_unmount auto unmount on process termination\n"); +" -o allow_other allow access by all users\n" +" -o allow_root allow access by root\n" +" --socket-path=PATH path for the vhost-user socket\n" +" -o vhost_user_socket=PATH path for the vhost-user socket\n" +" -o auto_unmount auto unmount on process termination\n"); } void fuse_session_destroy(struct fuse_session *se) diff --git a/contrib/virtiofsd/helper.c b/contrib/virtiofsd/helper.c index 958a42b6f4..f67533f053 100644 --- a/contrib/virtiofsd/helper.c +++ b/contrib/virtiofsd/helper.c @@ -126,15 +126,15 @@ static const struct fuse_opt conn_info_opt_spec[] = { void fuse_cmdline_help(void) { - printf(" -h --help print help\n" - " -V --version print version\n" - " -d -o debug enable debug output (implies -f)\n" - " -f foreground operation\n" - " -s disable multi-threaded operation\n" - " -o clone_fd use separate fuse device fd for each thread\n" - " (may improve performance)\n" - " -o max_idle_threads the maximum number of idle worker threads\n" - " allowed (default: 10)\n"); + printf(" -h --help print help\n" + " -V --version print version\n" + " -d -o debug enable debug output (implies -f)\n" + " -f foreground operation\n" + " -s disable multi-threaded operation\n" + " -o clone_fd use separate fuse device fd for each thread\n" + " (may improve performance)\n" + " -o max_idle_threads the maximum number of idle worker threads\n" + " allowed (default: 10)\n"); } static int fuse_helper_opt_proc(void *data, const char *arg, int key,