|
 |
902636 |
From 6d41fc549198e140f38fddcb02975098df040ae1 Mon Sep 17 00:00:00 2001
|
|
|
902636 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
902636 |
Date: Mon, 27 Jan 2020 19:00:50 +0100
|
|
|
902636 |
Subject: [PATCH 019/116] virtiofsd: Fix common header and define for QEMU
|
|
|
902636 |
builds
|
|
|
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-16-dgilbert@redhat.com>
|
|
|
902636 |
Patchwork-id: 93470
|
|
|
902636 |
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 015/112] virtiofsd: Fix common header and define for QEMU builds
|
|
|
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: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
902636 |
|
|
|
902636 |
All of the fuse files include config.h and define GNU_SOURCE
|
|
|
902636 |
where we don't have either under our build - remove them.
|
|
|
902636 |
Fixup path to the kernel's fuse.h in the QEMUs world.
|
|
|
902636 |
|
|
|
902636 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
902636 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
902636 |
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
902636 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
902636 |
(cherry picked from commit 09863ebc7e32a107235b3c815ad54d26cc64f07a)
|
|
|
902636 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
902636 |
---
|
|
|
902636 |
tools/virtiofsd/buffer.c | 4 +---
|
|
|
902636 |
tools/virtiofsd/fuse_i.h | 3 +++
|
|
|
902636 |
tools/virtiofsd/fuse_log.c | 1 +
|
|
|
902636 |
tools/virtiofsd/fuse_lowlevel.c | 6 ++----
|
|
|
902636 |
tools/virtiofsd/fuse_opt.c | 2 +-
|
|
|
902636 |
tools/virtiofsd/fuse_signals.c | 2 +-
|
|
|
902636 |
tools/virtiofsd/helper.c | 1 +
|
|
|
902636 |
tools/virtiofsd/passthrough_ll.c | 8 ++------
|
|
|
902636 |
8 files changed, 12 insertions(+), 15 deletions(-)
|
|
|
902636 |
|
|
|
902636 |
diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c
|
|
|
902636 |
index 4d507f3..772efa9 100644
|
|
|
902636 |
--- a/tools/virtiofsd/buffer.c
|
|
|
902636 |
+++ b/tools/virtiofsd/buffer.c
|
|
|
902636 |
@@ -9,9 +9,7 @@
|
|
|
902636 |
* See the file COPYING.LIB
|
|
|
902636 |
*/
|
|
|
902636 |
|
|
|
902636 |
-#define _GNU_SOURCE
|
|
|
902636 |
-
|
|
|
902636 |
-#include "config.h"
|
|
|
902636 |
+#include "qemu/osdep.h"
|
|
|
902636 |
#include "fuse_i.h"
|
|
|
902636 |
#include "fuse_lowlevel.h"
|
|
|
902636 |
#include <assert.h>
|
|
|
902636 |
diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h
|
|
|
902636 |
index e63cb58..bae0699 100644
|
|
|
902636 |
--- a/tools/virtiofsd/fuse_i.h
|
|
|
902636 |
+++ b/tools/virtiofsd/fuse_i.h
|
|
|
902636 |
@@ -6,6 +6,9 @@
|
|
|
902636 |
* See the file COPYING.LIB
|
|
|
902636 |
*/
|
|
|
902636 |
|
|
|
902636 |
+#define FUSE_USE_VERSION 31
|
|
|
902636 |
+
|
|
|
902636 |
+
|
|
|
902636 |
#include "fuse.h"
|
|
|
902636 |
#include "fuse_lowlevel.h"
|
|
|
902636 |
|
|
|
902636 |
diff --git a/tools/virtiofsd/fuse_log.c b/tools/virtiofsd/fuse_log.c
|
|
|
902636 |
index 11345f9..c301ff6 100644
|
|
|
902636 |
--- a/tools/virtiofsd/fuse_log.c
|
|
|
902636 |
+++ b/tools/virtiofsd/fuse_log.c
|
|
|
902636 |
@@ -8,6 +8,7 @@
|
|
|
902636 |
* See the file COPYING.LIB
|
|
|
902636 |
*/
|
|
|
902636 |
|
|
|
902636 |
+#include "qemu/osdep.h"
|
|
|
902636 |
#include "fuse_log.h"
|
|
|
902636 |
|
|
|
902636 |
#include <stdarg.h>
|
|
|
902636 |
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
|
|
|
902636 |
index 3da80de..07fb8a6 100644
|
|
|
902636 |
--- a/tools/virtiofsd/fuse_lowlevel.c
|
|
|
902636 |
+++ b/tools/virtiofsd/fuse_lowlevel.c
|
|
|
902636 |
@@ -9,11 +9,9 @@
|
|
|
902636 |
* See the file COPYING.LIB
|
|
|
902636 |
*/
|
|
|
902636 |
|
|
|
902636 |
-#define _GNU_SOURCE
|
|
|
902636 |
-
|
|
|
902636 |
-#include "config.h"
|
|
|
902636 |
+#include "qemu/osdep.h"
|
|
|
902636 |
#include "fuse_i.h"
|
|
|
902636 |
-#include "fuse_kernel.h"
|
|
|
902636 |
+#include "standard-headers/linux/fuse.h"
|
|
|
902636 |
#include "fuse_misc.h"
|
|
|
902636 |
#include "fuse_opt.h"
|
|
|
902636 |
|
|
|
902636 |
diff --git a/tools/virtiofsd/fuse_opt.c b/tools/virtiofsd/fuse_opt.c
|
|
|
902636 |
index edd36f4..2892236 100644
|
|
|
902636 |
--- a/tools/virtiofsd/fuse_opt.c
|
|
|
902636 |
+++ b/tools/virtiofsd/fuse_opt.c
|
|
|
902636 |
@@ -9,8 +9,8 @@
|
|
|
902636 |
* See the file COPYING.LIB
|
|
|
902636 |
*/
|
|
|
902636 |
|
|
|
902636 |
+#include "qemu/osdep.h"
|
|
|
902636 |
#include "fuse_opt.h"
|
|
|
902636 |
-#include "config.h"
|
|
|
902636 |
#include "fuse_i.h"
|
|
|
902636 |
#include "fuse_misc.h"
|
|
|
902636 |
|
|
|
902636 |
diff --git a/tools/virtiofsd/fuse_signals.c b/tools/virtiofsd/fuse_signals.c
|
|
|
902636 |
index 19d6791..dc7c8ac 100644
|
|
|
902636 |
--- a/tools/virtiofsd/fuse_signals.c
|
|
|
902636 |
+++ b/tools/virtiofsd/fuse_signals.c
|
|
|
902636 |
@@ -8,7 +8,7 @@
|
|
|
902636 |
* See the file COPYING.LIB
|
|
|
902636 |
*/
|
|
|
902636 |
|
|
|
902636 |
-#include "config.h"
|
|
|
902636 |
+#include "qemu/osdep.h"
|
|
|
902636 |
#include "fuse_i.h"
|
|
|
902636 |
#include "fuse_lowlevel.h"
|
|
|
902636 |
|
|
|
902636 |
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
|
|
|
902636 |
index d9227d7..9333691 100644
|
|
|
902636 |
--- a/tools/virtiofsd/helper.c
|
|
|
902636 |
+++ b/tools/virtiofsd/helper.c
|
|
|
902636 |
@@ -10,6 +10,7 @@
|
|
|
902636 |
* See the file COPYING.LIB.
|
|
|
902636 |
*/
|
|
|
902636 |
|
|
|
902636 |
+#include "qemu/osdep.h"
|
|
|
902636 |
#include "fuse_i.h"
|
|
|
902636 |
#include "fuse_lowlevel.h"
|
|
|
902636 |
#include "fuse_misc.h"
|
|
|
902636 |
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
|
902636 |
index 126a56c..322a889 100644
|
|
|
902636 |
--- a/tools/virtiofsd/passthrough_ll.c
|
|
|
902636 |
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
|
902636 |
@@ -35,15 +35,11 @@
|
|
|
902636 |
* \include passthrough_ll.c
|
|
|
902636 |
*/
|
|
|
902636 |
|
|
|
902636 |
-#define _GNU_SOURCE
|
|
|
902636 |
-#define FUSE_USE_VERSION 31
|
|
|
902636 |
-
|
|
|
902636 |
-#include "config.h"
|
|
|
902636 |
-
|
|
|
902636 |
+#include "qemu/osdep.h"
|
|
|
902636 |
+#include "fuse_lowlevel.h"
|
|
|
902636 |
#include <assert.h>
|
|
|
902636 |
#include <dirent.h>
|
|
|
902636 |
#include <errno.h>
|
|
|
902636 |
-#include <fuse_lowlevel.h>
|
|
|
902636 |
#include <inttypes.h>
|
|
|
902636 |
#include <limits.h>
|
|
|
902636 |
#include <pthread.h>
|
|
|
902636 |
--
|
|
|
902636 |
1.8.3.1
|
|
|
902636 |
|