ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtiofs pull 20200221 

Mostly minor cleanups.
 Miroslav's fixes a make install corner case.
 Philippe's set includes an error corner case fix.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEERfXHG0oMt/uXep+pBRYzHrxb/ecFAl5P2WMACgkQBRYzHrxb
 /ecIuw/9HmZTEL+kDHt84LINVwJmr0bZUK4wEa0K41yCKsTdtHhZOg2p5L1+HcS/
 t0jZa8RisqiFLPuJoBfFSDSX9V/RSjz7Ay2nIP3hJLhssPbpU+YM6pep2RmmNz3I
 mJi+l8AFuyd+CBQvecVvMLv8+RybOyc6+g4vEws//d61yZ6nzovSeeMiZdthfJhq
 Qs6fFmTKqRrziDTS0+CuoOhJ8ErC1R7tanTzN4Ke2nDUw2i53bco7dLtFYkZ0YL4
 mOPb5txOZt2uTTMkaw9Np3+ahZ4/xoCW9igwQy9bGNwY7FnqUlobLBcpK80M9aGA
 XTX+YruK/t19+4EwQe0CVAPwNI24kijq604SWCyGOA90KQz4IO8Dtj0gSWCfFBcn
 4ffj6/OgZM7IeXD/IomfPTzyyGxVyyP54aT+DiMzBhAm9Tk14kwK0HdsmSt4PgIG
 pBgFCMPQmaOp4LJTY/RHls0lYU/LlTzYlyqLtYMGosZZcO1Zze980+EPXf8JKBER
 svTcnAOFTK6Yht6EskyQx9bgsGNIMmL69pNpuArYKjv+uXKQhuRmlkg3MJcVsIUE
 bCVNLIqyZqk3POnCkFiKMK4QZH0qwMf8QBs6j3M6I0nyVzLgk67t/BN55z1Ga6Jn
 UrgPXqBYBd0NnmE4WLNmzTDlIrlITYi3/hNYOWU7E5Eh3nylyoc=
 =1ANS
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20200221' into staging

virtiofs pull 20200221

Mostly minor cleanups.
Miroslav's fixes a make install corner case.
Philippe's set includes an error corner case fix.

# gpg: Signature made Fri 21 Feb 2020 13:21:39 GMT
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert-gitlab/tags/pull-virtiofs-20200221:
  docs: Fix virtiofsd.1 location
  virtiofsd: Remove fuse.h and struct fuse_module
  tools/virtiofsd/fuse_lowlevel: Fix fuse_out_header::error value
  tools/virtiofsd/passthrough_ll: Remove unneeded variable assignment
  tools/virtiofsd/passthrough_ll: Remove unneeded variable assignment
  virtiofsd: Help message fix for 'seconds'

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-02-21 17:00:23 +00:00
parent 9ac5df20f5 5bb8e8beed
commit 88e2b97aa3
6 changed files with 3 additions and 1252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -865,7 +865,7 @@ ifdef CONFIG_VIRTFS
$(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/virtfs-proxy-helper.1 "$(DESTDIR)$(mandir)/man1"
endif
ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
$(INSTALL_DATA) docs/interop/virtiofsd.1 "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/virtiofsd.1 "$(DESTDIR)$(mandir)/man1"
endif
install-datadir:

1229
tools/virtiofsd/fuse.h
View File

File diff suppressed because it is too large Load Diff

16
tools/virtiofsd/fuse_i.h
View File

@ -10,7 +10,6 @@
#define FUSE_I_H
#define FUSE_USE_VERSION 31
#include "fuse.h"
#include "fuse_lowlevel.h"
struct fv_VuDev;
@ -82,21 +81,6 @@ struct fuse_chan {
struct fv_QueueInfo *qi;
};
/**
* Filesystem module
*
* Filesystem modules are registered with the FUSE_REGISTER_MODULE()
* macro.
*
*/
struct fuse_module {
char *name;
fuse_module_factory_t factory;
struct fuse_module *next;
struct fusemod_so *so;
int ctr;
};
int fuse_send_reply_iov_nofree(fuse_req_t req, int error, struct iovec *iov,
int count);
void fuse_free_req(fuse_req_t req);

2
tools/virtiofsd/fuse_lowlevel.c
View File

@ -192,7 +192,7 @@ int fuse_send_reply_iov_nofree(fuse_req_t req, int error, struct iovec *iov,
if (error <= -1000 || error > 0) {
fuse_log(FUSE_LOG_ERR, "fuse: bad error value: %i\n", error);
error = -ERANGE;
out.error = -ERANGE;
}
iov[0].iov_base = &out;

2
tools/virtiofsd/helper.c
View File

@ -165,7 +165,7 @@ void fuse_cmdline_help(void)
" enable/disable readirplus\n"
" default: readdirplus except with "
"cache=none\n"
" -o timeout=<number> I/O timeout (second)\n"
" -o timeout=<number> I/O timeout (seconds)\n"
" default: depends on cache= option.\n"
" -o writeback|no_writeback enable/disable writeback cache\n"
" default: no_writeback\n"

4
tools/virtiofsd/passthrough_ll.c
View File

@ -922,7 +922,6 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t parent, const char *name,
inode = lo_find(lo, &e->attr);
if (inode) {
close(newfd);
newfd = -1;
} else {
inode = calloc(1, sizeof(struct lo_inode));
if (!inode) {
@ -939,7 +938,6 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t parent, const char *name,
inode->nlookup = 1;
inode->fd = newfd;
newfd = -1;
inode->key.ino = e->attr.st_ino;
inode->key.dev = e->attr.st_dev;
pthread_mutex_init(&inode->plock_mutex, NULL);
@ -1080,8 +1078,6 @@ static void lo_mknod_symlink(fuse_req_t req, fuse_ino_t parent,
return;
}
saverr = ENOMEM;
saverr = lo_change_cred(req, &old);
if (saverr) {
goto out;