diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-10 18:09:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-10 18:09:14 +0000 |
| commit | e18e5501d8ac692d32657a3e1ef545b14e72b730 (patch) | |
| tree | 9c298286abb6f0605ec168ffdd8ddf305ed7923a /docs/interop/conf.py | |
| parent | 81a23caf47956778c5a5056ad656d1ef92bf9659 (diff) | |
| parent | 6a7e2bbee5fa5f167959f05319550d2a49a6b8bb (diff) | |
| download | focaccia-qemu-e18e5501d8ac692d32657a3e1ef545b14e72b730.tar.gz focaccia-qemu-e18e5501d8ac692d32657a3e1ef545b14e72b730.zip | |
Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20200210' into staging
virtiofsd pull 2020-02-10 Coverity fixes and a reworked man page. # gpg: Signature made Mon 10 Feb 2020 17:26:29 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-20200210: docs: add virtiofsd(1) man page virtiofsd: do_read missing NULL check virtiofsd: load_capng missing unlock virtiofsd: fv_create_listen_socket error path socket leak virtiofsd: Remove fuse_req_getgroups Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/interop/conf.py')
| -rw-r--r-- | docs/interop/conf.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/interop/conf.py b/docs/interop/conf.py index b0f322207c..b3cda17042 100644 --- a/docs/interop/conf.py +++ b/docs/interop/conf.py @@ -27,5 +27,8 @@ man_pages = [ [], 1), ('virtfs-proxy-helper', 'virtfs-proxy-helper', u'QEMU 9p virtfs proxy filesystem helper', - ['M. Mohan Kumar'], 1) + ['M. Mohan Kumar'], 1), + ('virtiofsd', 'virtiofsd', u'QEMU virtio-fs shared file system daemon', + ['Stefan Hajnoczi <stefanha@redhat.com>', + 'Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>'], 1), ] |