[CRIU] [PATCH 3/9] cpuinfo: Update documentation for --cpu-cap

Cyrill Gorcunov gorcunov at openvz.org
Thu Sep 25 06:03:22 PDT 2014


Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 Documentation/criu.txt | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index a1296f9b5bdc..c10093e133c4 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -77,15 +77,25 @@ OPTIONS
     done with help of 'post-dump' script.
     In other words, do not use it until really needed.
 
-*--cpu-cap* 'cap'[,'cap']::
+*--cpu-cap* [,'cap']::
     When restore process require 'cap' CPU capability to be present. To inverse
     capability prefix it with '^'.
 
-    - *fpu*. Requre the CPU to have comaptible FPU. For example the process
-             might be dumped with xsave capability but attempted to restore
-             without it present on target cpu. In such case we refuse to procceed.
+    - *all*.     Require all capabilities. This is *default* mode if *--cpu-cap*
+                 is passed without arguments. Most safe mode.
 
-    - *all*. Require all capability. This is *default* mode.
+    - *none*.    Require none capabilities. Most dangerous mode when one knows
+                 what he is doing, the behaviour is implementation dependent.
+
+    - *cpuinfo*. Require the CPU to have all capabilities match. On *dump* the
+                 capabilities are writen into image file and on *restore* they
+                 are validated to match ones present on runtime CPU.
+
+    - *fpu*.     Requre the CPU to have comaptible FPU. For example the process
+                 might be dumped with xsave capability but attempted to restore
+                 without it present on target CPU. In such case we refuse to
+                 procceed. This is *default* mode if *--cpu-cap* is not present
+                 in command line.
 
 *-f*, *--file* 'file'::
     This option is valid for the *show* command only and allows one to see the
-- 
1.9.3



More information about the CRIU mailing list