diff options
| author | Peter Maydell | 2020-07-04 16:05:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-07-04 16:05:43 +0200 |
| commit | 0b100c8e72c54bcd6f865d6570ffe838dafe7105 (patch) | |
| tree | f21dc8a9340ca9e01aaa046978b9f72e55fb1d80 /docs | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200703' into staging (diff) | |
| parent | migration: Count new_dirty instead of real_dirty (diff) | |
| download | qemu-0b100c8e72c54bcd6f865d6570ffe838dafe7105.tar.gz qemu-0b100c8e72c54bcd6f865d6570ffe838dafe7105.tar.xz qemu-0b100c8e72c54bcd6f865d6570ffe838dafe7105.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200703a' into staging
virtiofsd+migration pull 2020-07-03
A couple of small migration fixes, and some capability
rework for virtiofsd.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
# gpg: Signature made Fri 03 Jul 2020 16:26:35 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-20200703a:
migration: Count new_dirty instead of real_dirty
migration: postcopy take proper error return
virtiofsd: Allow addition or removal of capabilities
virtiofsd: Check capability calls
virtiofsd: Terminate capability list
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/tools/virtiofsd.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 378594c422..824e713491 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -54,6 +54,11 @@ Options * flock|no_flock - Enable/disable flock. The default is ``no_flock``. + * modcaps=CAPLIST + Modify the list of capabilities allowed; CAPLIST is a colon separated + list of capabilities, each preceded by either + or -, e.g. + ''+sys_admin:-chown''. + * log_level=LEVEL - Print only log messages matching LEVEL or more severe. LEVEL is one of ``err``, ``warn``, ``info``, or ``debug``. The default is ``info``. |