| Message ID | 20191212163904.159893-11-dgilbert@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtiofs daemon [all] | expand |
On Thu, Dec 12, 2019 at 04:37:30PM +0000, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > QEMU's compiler enables warnings/errors for ignored values > and the (void) trick used in the fuse code isn't enough. > Turn all the return values into a return value on the function. > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > tools/virtiofsd/helper.c | 33 ++++++++++++++++++++++----------- > 1 file changed, 22 insertions(+), 11 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c > index d8c42401a7..8afccfc15e 100644 > --- a/tools/virtiofsd/helper.c > +++ b/tools/virtiofsd/helper.c > @@ -10,12 +10,10 @@ > * See the file COPYING.LIB. > */ > > -#include "config.h" > #include "fuse_i.h" > #include "fuse_lowlevel.h" > #include "fuse_misc.h" > #include "fuse_opt.h" > -#include "mount_util.h" > > #include <errno.h> > #include <limits.h> > @@ -177,6 +175,7 @@ int fuse_parse_cmdline(struct fuse_args *args, struct fuse_cmdline_opts *opts) > > int fuse_daemonize(int foreground) Yay, 4th implementation of "daemonize" logic in QEMU codebase :-) One day in the future it would be a nice idea to have a helper for this that we can share across the system emulator, qemu guest agent, qemu-nbd and virtiofsd. Not a requirement for this initial merge. Regards, Daniel
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index d8c42401a7..8afccfc15e 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -10,12 +10,10 @@ * See the file COPYING.LIB. */ -#include "config.h" #include "fuse_i.h" #include "fuse_lowlevel.h" #include "fuse_misc.h" #include "fuse_opt.h" -#include "mount_util.h" #include <errno.h> #include <limits.h> @@ -177,6 +175,7 @@ int fuse_parse_cmdline(struct fuse_args *args, struct fuse_cmdline_opts *opts) int fuse_daemonize(int foreground) { + int ret = 0, rett; if (!foreground) { int nullfd; int waiter[2]; @@ -198,8 +197,8 @@ int fuse_daemonize(int foreground) case 0: break; default: - (void)read(waiter[0], &completed, sizeof(completed)); - _exit(0); + _exit(read(waiter[0], &completed, + sizeof(completed) != sizeof(completed))); } if (setsid() == -1) { @@ -207,13 +206,22 @@ int fuse_daemonize(int foreground) return -1; } - (void)chdir("/"); + ret = chdir("/"); nullfd = open("/dev/null", O_RDWR, 0); if (nullfd != -1) { - (void)dup2(nullfd, 0); - (void)dup2(nullfd, 1); - (void)dup2(nullfd, 2); + rett = dup2(nullfd, 0); + if (!ret) { + ret = rett; + } + rett = dup2(nullfd, 1); + if (!ret) { + ret = rett; + } + rett = dup2(nullfd, 2); + if (!ret) { + ret = rett; + } if (nullfd > 2) { close(nullfd); } @@ -221,13 +229,16 @@ int fuse_daemonize(int foreground) /* Propagate completion of daemon initialization */ completed = 1; - (void)write(waiter[1], &completed, sizeof(completed)); + rett = write(waiter[1], &completed, sizeof(completed)); + if (!ret) { + ret = rett; + } close(waiter[0]); close(waiter[1]); } else { - (void)chdir("/"); + ret = chdir("/"); } - return 0; + return ret; } void fuse_apply_conn_info_opts(struct fuse_conn_info_opts *opts,