diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-08-28 18:37:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-08-28 18:37:49 +0100 |
| commit | a4e236b7d4badcd7383ed3cb86655e9bba0583cf (patch) | |
| tree | 4e6f6ff37842641ea1670f010eb1f9462042b7e7 /tools/virtiofsd/helper.c | |
| parent | ea1bb830cb021cca2e361091cf728aaabc8c0654 (diff) | |
| parent | fd9279ec9985d9c8a0b533eff24839f93695b0f4 (diff) | |
| download | qemu-a4e236b7d4badcd7383ed3cb86655e9bba0583cf.zip qemu-a4e236b7d4badcd7383ed3cb86655e9bba0583cf.tar.gz qemu-a4e236b7d4badcd7383ed3cb86655e9bba0583cf.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200828a' into staging
Migration and virtiofsd pull 2020-08-28
Migration:
vsock support for migration
minor fixes
virtiofsd:
Disable remote posix locks by default - because we
never supported blocking variants and this breaks things
Some prep work for un/less priviliged modes
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Fri 28 Aug 2020 13:43:18 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/tags/pull-migration-20200828a:
virtiofsd: probe unshare(CLONE_FS) and print an error
virtiofsd: drop CAP_DAC_READ_SEARCH
virtiofsd: Remove "norace" from cmdline help and docs
virtiofsd: Disable remote posix locks by default
migration: tls: fix memory leak in migration_tls_get_creds
migration: improve error reporting of block driver state name
migration: add vsock as data channel support
migration: unify the framework of socket-type channel
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tools/virtiofsd/helper.c')
| -rw-r--r-- | tools/virtiofsd/helper.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index 3105b6c..7bc5d7d 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -159,8 +159,6 @@ void fuse_cmdline_help(void) " -o max_idle_threads the maximum number of idle worker " "threads\n" " allowed (default: 10)\n" - " -o norace disable racy fallback\n" - " default: false\n" " -o posix_lock|no_posix_lock\n" " enable/disable remote posix lock\n" " default: posix_lock\n" |