Skip to content

Commit

Permalink
virtiofsd: Fix common header and define for QEMU builds
Browse files Browse the repository at this point in the history
All of the fuse files include config.h and define GNU_SOURCE
where we don't have either under our build - remove them.
Fixup path to the kernel's fuse.h in the QEMUs world.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  • Loading branch information
dagrh committed Jan 23, 2020
1 parent 30d8e49 commit 09863eb
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 15 deletions.
4 changes: 1 addition & 3 deletions tools/virtiofsd/buffer.c
Expand Up @@ -9,9 +9,7 @@
* See the file COPYING.LIB
*/

#define _GNU_SOURCE

#include "config.h"
#include "qemu/osdep.h"
#include "fuse_i.h"
#include "fuse_lowlevel.h"
#include <assert.h>
Expand Down
3 changes: 3 additions & 0 deletions tools/virtiofsd/fuse_i.h
Expand Up @@ -6,6 +6,9 @@
* See the file COPYING.LIB
*/

#define FUSE_USE_VERSION 31


#include "fuse.h"
#include "fuse_lowlevel.h"

Expand Down
1 change: 1 addition & 0 deletions tools/virtiofsd/fuse_log.c
Expand Up @@ -8,6 +8,7 @@
* See the file COPYING.LIB
*/

#include "qemu/osdep.h"
#include "fuse_log.h"

#include <stdarg.h>
Expand Down
6 changes: 2 additions & 4 deletions tools/virtiofsd/fuse_lowlevel.c
Expand Up @@ -9,11 +9,9 @@
* See the file COPYING.LIB
*/

#define _GNU_SOURCE

#include "config.h"
#include "qemu/osdep.h"
#include "fuse_i.h"
#include "fuse_kernel.h"
#include "standard-headers/linux/fuse.h"
#include "fuse_misc.h"
#include "fuse_opt.h"

Expand Down
2 changes: 1 addition & 1 deletion tools/virtiofsd/fuse_opt.c
Expand Up @@ -9,8 +9,8 @@
* See the file COPYING.LIB
*/

#include "qemu/osdep.h"
#include "fuse_opt.h"
#include "config.h"
#include "fuse_i.h"
#include "fuse_misc.h"

Expand Down
2 changes: 1 addition & 1 deletion tools/virtiofsd/fuse_signals.c
Expand Up @@ -8,7 +8,7 @@
* See the file COPYING.LIB
*/

#include "config.h"
#include "qemu/osdep.h"
#include "fuse_i.h"
#include "fuse_lowlevel.h"

Expand Down
1 change: 1 addition & 0 deletions tools/virtiofsd/helper.c
Expand Up @@ -10,6 +10,7 @@
* See the file COPYING.LIB.
*/

#include "qemu/osdep.h"
#include "fuse_i.h"
#include "fuse_lowlevel.h"
#include "fuse_misc.h"
Expand Down
8 changes: 2 additions & 6 deletions tools/virtiofsd/passthrough_ll.c
Expand Up @@ -35,15 +35,11 @@
* \include passthrough_ll.c
*/

#define _GNU_SOURCE
#define FUSE_USE_VERSION 31

#include "config.h"

#include "qemu/osdep.h"
#include "fuse_lowlevel.h"
#include <assert.h>
#include <dirent.h>
#include <errno.h>
#include <fuse_lowlevel.h>
#include <inttypes.h>
#include <limits.h>
#include <pthread.h>
Expand Down

0 comments on commit 09863eb

Please sign in to comment.