| Message ID | 20200121122433.50803-12-dgilbert@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | virtiofs daemon [all] | expand |
On 1/21/20 1:22 PM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > 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> > --- > tools/virtiofsd/buffer.c | 3 --- > tools/virtiofsd/fuse_i.h | 3 +++ > tools/virtiofsd/fuse_lowlevel.c | 5 +---- > tools/virtiofsd/fuse_opt.c | 1 - > tools/virtiofsd/fuse_signals.c | 1 - > tools/virtiofsd/passthrough_ll.c | 7 +------ > 6 files changed, 5 insertions(+), 15 deletions(-) > > diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c > index 5df946c82c..db1885ab19 100644 > --- a/tools/virtiofsd/buffer.c > +++ b/tools/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 <assert.h> > diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h > index e63cb58388..bae06992e0 100644 > --- a/tools/virtiofsd/fuse_i.h > +++ b/tools/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/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c > index b3d26cab66..f76f3d3fdc 100644 > --- a/tools/virtiofsd/fuse_lowlevel.c > +++ b/tools/virtiofsd/fuse_lowlevel.c > @@ -9,11 +9,8 @@ > * See the file COPYING.LIB > */ > > -#define _GNU_SOURCE > - > -#include "config.h" > #include "fuse_i.h" > -#include "fuse_kernel.h" > +#include "standard-headers/linux/fuse.h" > #include "fuse_misc.h" > #include "fuse_opt.h" > > diff --git a/tools/virtiofsd/fuse_opt.c b/tools/virtiofsd/fuse_opt.c > index edd36f4a3b..1fee55e266 100644 > --- a/tools/virtiofsd/fuse_opt.c > +++ b/tools/virtiofsd/fuse_opt.c > @@ -10,7 +10,6 @@ > */ > > #include "fuse_opt.h" > -#include "config.h" > #include "fuse_i.h" > #include "fuse_misc.h" > > diff --git a/tools/virtiofsd/fuse_signals.c b/tools/virtiofsd/fuse_signals.c > index 19d6791cb9..10a6f88088 100644 > --- a/tools/virtiofsd/fuse_signals.c > +++ b/tools/virtiofsd/fuse_signals.c > @@ -8,7 +8,6 @@ > * See the file COPYING.LIB > */ > > -#include "config.h" > #include "fuse_i.h" > #include "fuse_lowlevel.h" > > diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c > index 9377718d9d..e702f7dec6 100644 > --- a/tools/virtiofsd/passthrough_ll.c > +++ b/tools/virtiofsd/passthrough_ll.c > @@ -35,15 +35,10 @@ > * \include passthrough_ll.c > */ > > -#define _GNU_SOURCE > -#define FUSE_USE_VERSION 31 > - > -#include "config.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> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 1/21/20 4:24 PM, Philippe Mathieu-Daudé wrote: > On 1/21/20 1:22 PM, Dr. David Alan Gilbert (git) wrote: >> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> >> >> 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> >> --- >> tools/virtiofsd/buffer.c | 3 --- >> tools/virtiofsd/fuse_i.h | 3 +++ >> tools/virtiofsd/fuse_lowlevel.c | 5 +---- >> tools/virtiofsd/fuse_opt.c | 1 - >> tools/virtiofsd/fuse_signals.c | 1 - >> tools/virtiofsd/passthrough_ll.c | 7 +------ >> 6 files changed, 5 insertions(+), 15 deletions(-) >> >> diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c >> index 5df946c82c..db1885ab19 100644 >> --- a/tools/virtiofsd/buffer.c >> +++ b/tools/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 <assert.h> >> diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h >> index e63cb58388..bae06992e0 100644 >> --- a/tools/virtiofsd/fuse_i.h >> +++ b/tools/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/tools/virtiofsd/fuse_lowlevel.c >> b/tools/virtiofsd/fuse_lowlevel.c >> index b3d26cab66..f76f3d3fdc 100644 >> --- a/tools/virtiofsd/fuse_lowlevel.c >> +++ b/tools/virtiofsd/fuse_lowlevel.c >> @@ -9,11 +9,8 @@ >> * See the file COPYING.LIB >> */ >> -#define _GNU_SOURCE >> - >> -#include "config.h" >> #include "fuse_i.h" >> -#include "fuse_kernel.h" >> +#include "standard-headers/linux/fuse.h" >> #include "fuse_misc.h" >> #include "fuse_opt.h" >> diff --git a/tools/virtiofsd/fuse_opt.c b/tools/virtiofsd/fuse_opt.c >> index edd36f4a3b..1fee55e266 100644 >> --- a/tools/virtiofsd/fuse_opt.c >> +++ b/tools/virtiofsd/fuse_opt.c >> @@ -10,7 +10,6 @@ >> */ >> #include "fuse_opt.h" >> -#include "config.h" >> #include "fuse_i.h" >> #include "fuse_misc.h" >> diff --git a/tools/virtiofsd/fuse_signals.c >> b/tools/virtiofsd/fuse_signals.c >> index 19d6791cb9..10a6f88088 100644 >> --- a/tools/virtiofsd/fuse_signals.c >> +++ b/tools/virtiofsd/fuse_signals.c >> @@ -8,7 +8,6 @@ >> * See the file COPYING.LIB >> */ >> -#include "config.h" >> #include "fuse_i.h" >> #include "fuse_lowlevel.h" >> diff --git a/tools/virtiofsd/passthrough_ll.c >> b/tools/virtiofsd/passthrough_ll.c >> index 9377718d9d..e702f7dec6 100644 >> --- a/tools/virtiofsd/passthrough_ll.c >> +++ b/tools/virtiofsd/passthrough_ll.c >> @@ -35,15 +35,10 @@ >> * \include passthrough_ll.c >> */ >> -#define _GNU_SOURCE >> -#define FUSE_USE_VERSION 31 >> - >> -#include "config.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> >> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Shouldn't these files include "qemu/osdep.h" first, like the rest of the QEMU C files?
* Philippe Mathieu-Daudé (philmd@redhat.com) wrote: > On 1/21/20 4:24 PM, Philippe Mathieu-Daudé wrote: > > On 1/21/20 1:22 PM, Dr. David Alan Gilbert (git) wrote: > > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > > > 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> > > > --- > > > tools/virtiofsd/buffer.c | 3 --- > > > tools/virtiofsd/fuse_i.h | 3 +++ > > > tools/virtiofsd/fuse_lowlevel.c | 5 +---- > > > tools/virtiofsd/fuse_opt.c | 1 - > > > tools/virtiofsd/fuse_signals.c | 1 - > > > tools/virtiofsd/passthrough_ll.c | 7 +------ > > > 6 files changed, 5 insertions(+), 15 deletions(-) > > > > > > diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c > > > index 5df946c82c..db1885ab19 100644 > > > --- a/tools/virtiofsd/buffer.c > > > +++ b/tools/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 <assert.h> > > > diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h > > > index e63cb58388..bae06992e0 100644 > > > --- a/tools/virtiofsd/fuse_i.h > > > +++ b/tools/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/tools/virtiofsd/fuse_lowlevel.c > > > b/tools/virtiofsd/fuse_lowlevel.c > > > index b3d26cab66..f76f3d3fdc 100644 > > > --- a/tools/virtiofsd/fuse_lowlevel.c > > > +++ b/tools/virtiofsd/fuse_lowlevel.c > > > @@ -9,11 +9,8 @@ > > > * See the file COPYING.LIB > > > */ > > > -#define _GNU_SOURCE > > > - > > > -#include "config.h" > > > #include "fuse_i.h" > > > -#include "fuse_kernel.h" > > > +#include "standard-headers/linux/fuse.h" > > > #include "fuse_misc.h" > > > #include "fuse_opt.h" > > > diff --git a/tools/virtiofsd/fuse_opt.c b/tools/virtiofsd/fuse_opt.c > > > index edd36f4a3b..1fee55e266 100644 > > > --- a/tools/virtiofsd/fuse_opt.c > > > +++ b/tools/virtiofsd/fuse_opt.c > > > @@ -10,7 +10,6 @@ > > > */ > > > #include "fuse_opt.h" > > > -#include "config.h" > > > #include "fuse_i.h" > > > #include "fuse_misc.h" > > > diff --git a/tools/virtiofsd/fuse_signals.c > > > b/tools/virtiofsd/fuse_signals.c > > > index 19d6791cb9..10a6f88088 100644 > > > --- a/tools/virtiofsd/fuse_signals.c > > > +++ b/tools/virtiofsd/fuse_signals.c > > > @@ -8,7 +8,6 @@ > > > * See the file COPYING.LIB > > > */ > > > -#include "config.h" > > > #include "fuse_i.h" > > > #include "fuse_lowlevel.h" > > > diff --git a/tools/virtiofsd/passthrough_ll.c > > > b/tools/virtiofsd/passthrough_ll.c > > > index 9377718d9d..e702f7dec6 100644 > > > --- a/tools/virtiofsd/passthrough_ll.c > > > +++ b/tools/virtiofsd/passthrough_ll.c > > > @@ -35,15 +35,10 @@ > > > * \include passthrough_ll.c > > > */ > > > -#define _GNU_SOURCE > > > -#define FUSE_USE_VERSION 31 > > > - > > > -#include "config.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> > > > > > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Shouldn't these files include "qemu/osdep.h" first, like the rest of the > QEMU C files? Done. -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c index 5df946c82c..db1885ab19 100644 --- a/tools/virtiofsd/buffer.c +++ b/tools/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 <assert.h> diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h index e63cb58388..bae06992e0 100644 --- a/tools/virtiofsd/fuse_i.h +++ b/tools/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/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c index b3d26cab66..f76f3d3fdc 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -9,11 +9,8 @@ * See the file COPYING.LIB */ -#define _GNU_SOURCE - -#include "config.h" #include "fuse_i.h" -#include "fuse_kernel.h" +#include "standard-headers/linux/fuse.h" #include "fuse_misc.h" #include "fuse_opt.h" diff --git a/tools/virtiofsd/fuse_opt.c b/tools/virtiofsd/fuse_opt.c index edd36f4a3b..1fee55e266 100644 --- a/tools/virtiofsd/fuse_opt.c +++ b/tools/virtiofsd/fuse_opt.c @@ -10,7 +10,6 @@ */ #include "fuse_opt.h" -#include "config.h" #include "fuse_i.h" #include "fuse_misc.h" diff --git a/tools/virtiofsd/fuse_signals.c b/tools/virtiofsd/fuse_signals.c index 19d6791cb9..10a6f88088 100644 --- a/tools/virtiofsd/fuse_signals.c +++ b/tools/virtiofsd/fuse_signals.c @@ -8,7 +8,6 @@ * See the file COPYING.LIB */ -#include "config.h" #include "fuse_i.h" #include "fuse_lowlevel.h" diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index 9377718d9d..e702f7dec6 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -35,15 +35,10 @@ * \include passthrough_ll.c */ -#define _GNU_SOURCE -#define FUSE_USE_VERSION 31 - -#include "config.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>