summary refs log tree commit diff stats
path: root/fsdev/virtfs-proxy-helper.texi
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-11 15:09:33 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-11 15:09:33 +0000
commitfc1ec1acffd29d54c0c4266d30d38b2399d42f4f (patch)
tree38dd37dda993a32ca05e05102bb1838769613a12 /fsdev/virtfs-proxy-helper.texi
parentf16368459957603b8b3efa83353cc7e13ab6abd3 (diff)
parent1834ed3afc578b8dbf39838cfdf27d457771a334 (diff)
downloadfocaccia-qemu-fc1ec1acffd29d54c0c4266d30d38b2399d42f4f.tar.gz
focaccia-qemu-fc1ec1acffd29d54c0c4266d30d38b2399d42f4f.zip
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-02-11' into staging
trivial patches for 2016-02-11

# gpg: Signature made Thu 11 Feb 2016 12:16:04 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2016-02-11:
  w32: include winsock2.h before windows.h
  Adds keycode 86 to the hid_usage_keys translation table.
  s390x: remove s390-zipl.rom
  Passthru CCID card: QOMify
  Emulated CCID card: QOMify
  ES1370: QOMify
  char: fix parameter name / type in BSD codepath
  qmp-spec: fix index in doc
  rdma: remove check on time_spent when calculating mbs
  qemu-sockets: simplify error handling
  cpu: cpu_save/cpu_load is no more
  qom: Correct object_property_get_int() description
  man: virtfs-proxy-helper: Rework awkward sentence
  remove libtool support

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'fsdev/virtfs-proxy-helper.texi')
-rw-r--r--fsdev/virtfs-proxy-helper.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/fsdev/virtfs-proxy-helper.texi b/fsdev/virtfs-proxy-helper.texi
index 9a25d7ecf4..6eb2d5096a 100644
--- a/fsdev/virtfs-proxy-helper.texi
+++ b/fsdev/virtfs-proxy-helper.texi
@@ -28,8 +28,8 @@ QEMU and proxy helper communicate using this socket. QEMU proxy fs
 driver sends filesystem request to proxy helper and receives the
 response from it.
 
-Proxy helper is designed so that it can drop the root privilege with
-retaining capbilities needed for doing filesystem operations only.
+The proxy helper is designed so that it can drop root privileges except
+for the capabilities needed for doing filesystem operations.
 
 @end table
 @c man end