yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 7f2e1f79a3addb242c3018c7a80e2e57589119f0 Mon Sep 17 00:00:00 2001
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
Date: Mon, 27 Jan 2020 19:01:08 +0100
902636
Subject: [PATCH 037/116] virtiofsd: make -f (foreground) the default
902636
MIME-Version: 1.0
902636
Content-Type: text/plain; charset=UTF-8
902636
Content-Transfer-Encoding: 8bit
902636
902636
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
Message-id: <20200127190227.40942-34-dgilbert@redhat.com>
902636
Patchwork-id: 93489
902636
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 033/112] virtiofsd: make -f (foreground) the default
902636
Bugzilla: 1694164
902636
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
902636
902636
From: Stefan Hajnoczi <stefanha@redhat.com>
902636
902636
According to vhost-user.rst "Backend program conventions", backend
902636
programs should run in the foregound by default.  Follow the
902636
conventions so libvirt and other management tools can control virtiofsd
902636
in a standard way.
902636
902636
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
902636
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
(cherry picked from commit 0bbd31753714ac2899efda0f0de31e353e965789)
902636
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
902636
---
902636
 tools/virtiofsd/helper.c | 8 ++++++++
902636
 1 file changed, 8 insertions(+)
902636
902636
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
902636
index 676032e..a3645fc 100644
902636
--- a/tools/virtiofsd/helper.c
902636
+++ b/tools/virtiofsd/helper.c
902636
@@ -29,6 +29,11 @@
902636
     {                                               \
902636
         t, offsetof(struct fuse_cmdline_opts, p), 1 \
902636
     }
902636
+#define FUSE_HELPER_OPT_VALUE(t, p, v)              \
902636
+    {                                               \
902636
+        t, offsetof(struct fuse_cmdline_opts, p), v \
902636
+    }
902636
+
902636
 
902636
 static const struct fuse_opt fuse_helper_opts[] = {
902636
     FUSE_HELPER_OPT("-h", show_help),
902636
@@ -42,6 +47,7 @@ static const struct fuse_opt fuse_helper_opts[] = {
902636
     FUSE_OPT_KEY("-d", FUSE_OPT_KEY_KEEP),
902636
     FUSE_OPT_KEY("debug", FUSE_OPT_KEY_KEEP),
902636
     FUSE_HELPER_OPT("-f", foreground),
902636
+    FUSE_HELPER_OPT_VALUE("--daemonize", foreground, 0),
902636
     FUSE_HELPER_OPT("fsname=", nodefault_subtype),
902636
     FUSE_OPT_KEY("fsname=", FUSE_OPT_KEY_KEEP),
902636
     FUSE_HELPER_OPT("subtype=", nodefault_subtype),
902636
@@ -131,6 +137,7 @@ void fuse_cmdline_help(void)
902636
            "    -V   --version             print version\n"
902636
            "    -d   -o debug              enable debug output (implies -f)\n"
902636
            "    -f                         foreground operation\n"
902636
+           "    --daemonize                run in background\n"
902636
            "    -o max_idle_threads        the maximum number of idle worker "
902636
            "threads\n"
902636
            "                               allowed (default: 10)\n");
902636
@@ -158,6 +165,7 @@ int fuse_parse_cmdline(struct fuse_args *args, struct fuse_cmdline_opts *opts)
902636
     memset(opts, 0, sizeof(struct fuse_cmdline_opts));
902636
 
902636
     opts->max_idle_threads = 10;
902636
+    opts->foreground = 1;
902636
 
902636
     if (fuse_opt_parse(args, opts, fuse_helper_opts, fuse_helper_opt_proc) ==
902636
         -1) {
902636
-- 
902636
1.8.3.1
902636