virtiofsd: Remove "norace" from cmdline help
PATCH 1/1 virtiofsd: Remove "norace" from cmdline help
Commit 93bb3d8d4cda ("virtiofsd: remove symlink fallbacks") removed the implementation of the "norace" option, so remove it from the cmdline help too.
--- tools/virtiofsd/helper.c | 2 -- 1 file changed, 2 deletions(-)
tools/virtiofsd/helper.c +0 -2
@@ -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"
Signature · 1 line
2.26.2
Quoted 15 lines · Sergio Lopez
Commit
93bb3d8d4cda("virtiofsd: remove symlink fallbacks") removed the implementation of the "norace" option, so remove it from the cmdline help too.Signed-off-by Sergio Lopez <[email protected]>--- tools/virtiofsd/helper.c | 2 -- 1 file changed, 2 deletions(-)tools/virtiofsd/helper.c +0
-0
tools/virtiofsd/helper.c void fuse_cmdline_help(void) · line 164
Quoted 8 lines
tools/virtiofsd/helper.c +0
-2@@ -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"
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
TEST iotest-qcow2: 021
TEST check-unit: tests/test-char
**
ERROR:/tmp/qemu-test/src/tests/test-char.c:1204:char_serial_test: 'chr' should not be NULL
ERROR test-char - Bail out! ERROR:/tmp/qemu-test/src/tests/test-char.c:1204:char_serial_test: 'chr' should not be NULL
make: *** [check-unit] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 022
TEST iotest-qcow2: 024
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=c2a035b46ef1404189ecd5ad0e54218b', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-ejccc2km/src/docker-src.2020-07-16-09.20.42.7214:/var/tmp/qemu:z,ro', 'qemu/centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=c2a035b46ef1404189ecd5ad0e54218b
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-ejccc2km/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 15m33.559s
user 0m9.323s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 26 lines · Sergio Lopez
Commit
93bb3d8d4cda("virtiofsd: remove symlink fallbacks") removed the implementation of the "norace" option, so remove it from the cmdline help too.Signed-off-by Sergio Lopez <[email protected]>--- tools/virtiofsd/helper.c | 2 -- 1 file changed, 2 deletions(-)tools/virtiofsd/helper.c +0
-2@@ -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" Signature · 1 line
2.26.2
I noticed that 'norace' is also described in docs/tools/virtiofsd.rst, so I think we need to remove it there too:
diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 824e713491..58666a4495 100644
--- a/docs/tools/virtiofsd.rst
+++ b/docs/tools/virtiofsd.rst
@@ -63,9 +63,6 @@ Options
Print only log messages matching LEVEL or more severe. LEVEL is one of ``err``, ``warn``, ``info``, or ``debug``. The default is ``info``.
- * norace -
- Disable racy fallback. The default is false.
-
* posix_lock|no_posix_lock -
Enable/disable remote POSIX locks. The default is ``posix_lock``.
With that fixed:
Thanks,
Stefano
Quoted 39 lines · Stefano Garzarella
Quoted 26 lines · Sergio Lopez
Commit
93bb3d8d4cda("virtiofsd: remove symlink fallbacks") removed the implementation of the "norace" option, so remove it from the cmdline help too.Signed-off-by Sergio Lopez <[email protected]>--- tools/virtiofsd/helper.c | 2 -- 1 file changed, 2 deletions(-)tools/virtiofsd/helper.c +0
-2@@ -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" Signature · 1 line
2.26.2I noticed that 'norace' is also described in
docs/tools/virtiofsd.rst, so I think we need to remove it there too:diff --git
a/docs/tools/virtiofsd.rstb/docs/tools/virtiofsd.rstindex824e713491..58666a4495100644
---a/docs/tools/virtiofsd.rst
+++b/docs/tools/virtiofsd.rst
@@ -63,9 +63,6 @@ Options
Print only log messages matching LEVEL or more severe. LEVEL is one of ``err``, ``warn``, ``info``, or ``debug``. The default is ``info``.
Quoted 5 lines
- * norace -
- Disable racy fallback. The default is false.
-
* posix_lock|no_posix_lock -
Enable/disable remote POSIX locks. The default is ``posix_lock``.
Good catch, thanks. I'll send a v2.
Sergio.
Quoted 6 lines
With that fixed:
Reviewed-by Stefano Garzarella <[email protected]>Thanks,
Stefano