diff options
| author | Peter Maydell | 2021-09-19 19:53:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-09-19 19:53:29 +0200 |
| commit | 7adb961995a3744f51396502b33ad04a56a317c3 (patch) | |
| tree | 44dac895156773a239086d954fb7d8d565dd773d /tools | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.2-pull-re... (diff) | |
| parent | virtiofsd: Reverse req_list before processing it (diff) | |
| download | qemu-7adb961995a3744f51396502b33ad04a56a317c3.tar.gz qemu-7adb961995a3744f51396502b33ad04a56a317c3.tar.xz qemu-7adb961995a3744f51396502b33ad04a56a317c3.zip | |
Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20210916' into staging
virtiofsd pull 2021-08-16
Two minor fixes; one for performance, the other seccomp
on s390x.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Thu 16 Sep 2021 14:51:38 BST
# 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-20210916:
virtiofsd: Reverse req_list before processing it
tools/virtiofsd: Add fstatfs64 syscall to the seccomp allowlist
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virtiofsd/fuse_virtio.c | 1 | ||||
| -rw-r--r-- | tools/virtiofsd/passthrough_seccomp.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index fc2564a603..8f4fd165b9 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -716,6 +716,7 @@ static void *fv_queue_thread(void *opaque) /* Process all the requests. */ if (!se->thread_pool_size && req_list != NULL) { + req_list = g_list_reverse(req_list); g_list_foreach(req_list, fv_queue_worker, qi); g_list_free(req_list); req_list = NULL; diff --git a/tools/virtiofsd/passthrough_seccomp.c b/tools/virtiofsd/passthrough_seccomp.c index f49ed94b5e..a3ce9f898d 100644 --- a/tools/virtiofsd/passthrough_seccomp.c +++ b/tools/virtiofsd/passthrough_seccomp.c @@ -51,6 +51,7 @@ static const int syscall_allowlist[] = { SCMP_SYS(fsetxattr), SCMP_SYS(fstat), SCMP_SYS(fstatfs), + SCMP_SYS(fstatfs64), SCMP_SYS(fsync), SCMP_SYS(ftruncate), SCMP_SYS(futex), |