[PATCH 10/30] virtiofsd: Fix common header and define for QEMU builds

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <address@hidden>

All of the fuse files include config.h and define GNU_SOURCE
where we don't have either under our build - remove them.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
 contrib/virtiofsd/buffer.c         |  3 ---
 contrib/virtiofsd/fuse_i.h         |  3 +++
 contrib/virtiofsd/fuse_loop_mt.c   |  3 +--
 contrib/virtiofsd/fuse_lowlevel.c  |  9 ---------
 contrib/virtiofsd/fuse_opt.c       |  1 -
 contrib/virtiofsd/fuse_signals.c   |  3 +--
 contrib/virtiofsd/passthrough_ll.c | 10 +++-------
 7 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/contrib/virtiofsd/buffer.c b/contrib/virtiofsd/buffer.c
index 5ab9b87455..3c9b443fa0 100644
--- a/contrib/virtiofsd/buffer.c
+++ b/contrib/virtiofsd/buffer.c
@@ -9,9 +9,6 @@
   See the file COPYING.LIB
 */
 
-#define _GNU_SOURCE
-
-#include "config.h"
 #include "fuse_i.h"
 #include "fuse_lowlevel.h"
 #include <string.h>
diff --git a/contrib/virtiofsd/fuse_i.h b/contrib/virtiofsd/fuse_i.h
index bcd6a140fc..6c3f432d0e 100644
--- a/contrib/virtiofsd/fuse_i.h
+++ b/contrib/virtiofsd/fuse_i.h
@@ -6,6 +6,9 @@
   See the file COPYING.LIB
 */
 
+#define FUSE_USE_VERSION 31
+
+
 #include "fuse.h"
 #include "fuse_lowlevel.h"
 
diff --git a/contrib/virtiofsd/fuse_loop_mt.c b/contrib/virtiofsd/fuse_loop_mt.c
index 6fcd47e42c..e45b2337a0 100644
--- a/contrib/virtiofsd/fuse_loop_mt.c
+++ b/contrib/virtiofsd/fuse_loop_mt.c
@@ -8,11 +8,10 @@
   See the file COPYING.LIB.
 */
 
-#include "config.h"
+#include "fuse_i.h"
 #include "fuse_lowlevel.h"
 #include "fuse_misc.h"
 #include "fuse_kernel.h"
-#include "fuse_i.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/contrib/virtiofsd/fuse_lowlevel.c 
b/contrib/virtiofsd/fuse_lowlevel.c
index a36a00e793..5ea113ab49 100644
--- a/contrib/virtiofsd/fuse_lowlevel.c
+++ b/contrib/virtiofsd/fuse_lowlevel.c
@@ -9,14 +9,10 @@
   See the file COPYING.LIB
 */
 
-#define _GNU_SOURCE
-
-#include "config.h"
 #include "fuse_i.h"
 #include "fuse_kernel.h"
 #include "fuse_opt.h"
 #include "fuse_misc.h"
-#include "mount_util.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1954,7 +1950,6 @@ static struct {
        [FUSE_READDIRPLUS] = { do_readdirplus,  "READDIRPLUS"},
        [FUSE_RENAME2]     = { do_rename2,      "RENAME2"    },
        [FUSE_COPY_FILE_RANGE] = { do_copy_file_range, "COPY_FILE_RANGE" },
-       [CUSE_INIT]        = { cuse_lowlevel_init, "CUSE_INIT"   },
 };
 
 #define FUSE_MAXOP (sizeof(fuse_ll_ops) / sizeof(fuse_ll_ops[0]))
@@ -2073,7 +2068,6 @@ void fuse_lowlevel_version(void)
 {
        printf("using FUSE kernel interface version %i.%i\n",
               FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);
-       fuse_mount_version();
 }
 
 void fuse_lowlevel_help(void)
@@ -2151,9 +2145,6 @@ struct fuse_session *fuse_session_new(struct fuse_args 
*args,
                goto out4;
        }
 
-       if (se->debug)
-               fuse_log(FUSE_LOG_DEBUG, "FUSE library version: %s\n", 
PACKAGE_VERSION);
-
        se->bufsize = FUSE_MAX_MAX_PAGES * getpagesize() +
                FUSE_BUFFER_HEADER_SIZE;
 
diff --git a/contrib/virtiofsd/fuse_opt.c b/contrib/virtiofsd/fuse_opt.c
index 93066b926e..b81d4bc4c9 100644
--- a/contrib/virtiofsd/fuse_opt.c
+++ b/contrib/virtiofsd/fuse_opt.c
@@ -9,7 +9,6 @@
   See the file COPYING.LIB
 */
 
-#include "config.h"
 #include "fuse_i.h"
 #include "fuse_opt.h"
 #include "fuse_misc.h"
diff --git a/contrib/virtiofsd/fuse_signals.c b/contrib/virtiofsd/fuse_signals.c
index 4271947bd4..e8f9b1e9a6 100644
--- a/contrib/virtiofsd/fuse_signals.c
+++ b/contrib/virtiofsd/fuse_signals.c
@@ -8,9 +8,8 @@
   See the file COPYING.LIB
 */
 
-#include "config.h"
-#include "fuse_lowlevel.h"
 #include "fuse_i.h"
+#include "fuse_lowlevel.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/contrib/virtiofsd/passthrough_ll.c 
b/contrib/virtiofsd/passthrough_ll.c
index 8f94dcbc92..72fae9d10b 100644
--- a/contrib/virtiofsd/passthrough_ll.c
+++ b/contrib/virtiofsd/passthrough_ll.c
@@ -34,12 +34,7 @@
  * \include passthrough_ll.c
  */
 
-#define _GNU_SOURCE
-#define FUSE_USE_VERSION 31
-
-#include "config.h"
-
-#include <fuse_lowlevel.h>
+#include "fuse_lowlevel.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -57,6 +52,8 @@
 
 #include "passthrough_helpers.h"
 
+#define HAVE_POSIX_FALLOCATE 1
+
 /* We are re-using pointers to our `struct lo_inode` and `struct
    lo_dirp` elements as inodes. This means that we must be able to
    store uintptr_t values in a fuse_ino_t variable. The following
@@ -1224,7 +1221,6 @@ int main(int argc, char *argv[])
                ret = 0;
                goto err_out1;
        } else if (opts.show_version) {
-               printf("FUSE library version %s\n", fuse_pkgversion());
                fuse_lowlevel_version();
                ret = 0;
                goto err_out1;
-- 
2.23.0