From nobody Fri Oct 3 11:37:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579807213; cv=none; d=zohomail.com; s=zohoarc; b=BtXYi+vuxkdCB2fH4GtzKW74k4DBfD04WZjJPAN2VKsTcbv0G5KW3aLNdm6Svk6HLAqyd+xGCuFlJrOHLI+xhwPMu4i42cSbvGqs4BWTi56ryG6rG95djruKXpxie8cWBIpienYstdnRp6GhQyOfH5ZI+RrubXWcZZMwCV9d8TY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579807213; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TcJ+qIvPBd+NE8+Obl+5mSiGYqc48+K+DQe87dF439I=; b=eU1btq/MhOOgverrkhdIPbRUQ70FiUJ1Silx7i+scGyKpEGu4z+CbGtLZMTiM2z/u3oEHa125c+gv1gT9F5xyf+7mtZzZVfIAoRpEkwNQ6JfwzU5gduHZhkwtQqNszqyG4/teJBQWBxrAYtKX6tTpj+kSNv0HGq8BtnlcVh5YL4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 157980721341064.24282299224683; Thu, 23 Jan 2020 11:20:13 -0800 (PST) Received: from localhost ([::1]:35550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iui1T-0007Yf-Et for importer@patchew.org; Thu, 23 Jan 2020 14:20:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40943) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufdO-0004O2-CC for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufdN-0006F8-3m for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:10 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:29905 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iufdN-0006Eu-0v for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:09 -0500 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-45-iaL4T4BIOQSTguRIKnwMPQ-1; Thu, 23 Jan 2020 11:47:06 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C355C803A28 for ; Thu, 23 Jan 2020 16:47:05 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 198CF28991; Thu, 23 Jan 2020 16:47:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TcJ+qIvPBd+NE8+Obl+5mSiGYqc48+K+DQe87dF439I=; b=FDsr4zRedQgneQf8wU3cXdYw+3LvQsKw2T6cmXZlgaPLfBl4biy+zXRurtWrvOk9x+STiq K6+N6Lacya84Epi1sMu258kFTP9+03uDEONzh0CQZTs5mcsxf6OEbMriGy/jJESNIpBn59 /Tzi+7Kscu2o7B4EVyYkQiRs5+GWc2o= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 016/108] virtiofsd: Add options for virtio Date: Thu, 23 Jan 2020 16:44:58 +0000 Message-Id: <20200123164630.91498-17-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: iaL4T4BIOQSTguRIKnwMPQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Add options to specify parameters for virtio-fs paths, i.e. ./virtiofsd -o vhost_user_socket=3D/tmp/vhostqemu Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Misono Tomohiro Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_i.h | 1 + tools/virtiofsd/fuse_lowlevel.c | 11 ++++++++--- tools/virtiofsd/helper.c | 14 +++++++------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h index bae06992e0..26b1a7da88 100644 --- a/tools/virtiofsd/fuse_i.h +++ b/tools/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; }; =20 struct fuse_chan { diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index 8552cfb8af..17e8718283 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -2115,8 +2115,11 @@ reply_err: } =20 static const struct fuse_opt fuse_ll_opts[] =3D { - LL_OPTION("debug", debug, 1), LL_OPTION("-d", debug, 1), - LL_OPTION("--debug", debug, 1), LL_OPTION("allow_root", deny_others, 1= ), + LL_OPTION("debug", debug, 1), + LL_OPTION("-d", debug, 1), + LL_OPTION("--debug", debug, 1), + LL_OPTION("allow_root", deny_others, 1), + LL_OPTION("--socket-path=3D%s", vu_socket_path, 0), FUSE_OPT_END }; =20 @@ -2132,7 +2135,9 @@ 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_root allow access by root\n"); + printf( + " -o allow_root allow access by root\n" + " --socket-path=3DPATH path for the vhost-user socket\n= "); } =20 void fuse_session_destroy(struct fuse_session *se) diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index 9333691525..676032e71f 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -127,13 +127,13 @@ static const struct fuse_opt conn_info_opt_spec[] =3D= { =20 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" - " -o max_idle_threads the maximum number of idle worker thre= ads\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" + " -o max_idle_threads the maximum number of idle work= er " + "threads\n" + " allowed (default: 10)\n"); } =20 static int fuse_helper_opt_proc(void *data, const char *arg, int key, --=20 2.24.1