- 30 Oct, 2018 40 commits
-
-
Adrian Reber authored
With the previous change to dynamically allocate memory for each possible configuration source (three different configuration files, CLI, RPC) the char * options can no longer directly point to the character strings extracted by getopt() as the memory might be free'd at some point. This introduces a macro to set the char * options which first does a xfree() and then a xstrdup(). Signed-off-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Adrian Reber authored
The code to read and parse configuration files was writing the result of the global configuration file to one variable and the result from the configuration file in the user's home to another variable: char **global_conf = NULL; char **user_conf = NULL; With this change the code now uses dynamic memory allocation to handle the different configuration files. It used to be: * parse global config * parse user config * evaluate global config * evaluate user config * evaluate CLI And now it is: * parse global config * evaluate global config * parse user config * evaluate user config * evaluate CLI This change is in preparation for the upcoming setting of a configuration file via environment variable and RPC configuration file usage. Signed-off-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Adrian Reber authored
This just moves the functions init_opts() and deprecated_ok() also to config.c as that is where most of the option and configuration setup and handling is done today. Signed-off-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Adrian Reber authored
The variable show_dump_file and show_fmt are assigned but never used, this remove the assignment. The CLI option still exists to not break the user interface. It exists, but it is unused. Signed-off-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Adrian Reber authored
This removes the code around '--pid, -p' which is not used at all. The command-line option is still available to not break CRIU users, but as the result has not been used, just remove the code assigning it. Signed-off-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Adrian Reber authored
This moves the whole getopt setup and analysis out of main() into its own function in config.c. The main motivation for this change is to be able to call getopt parsing and configuration file parsing also from the RPC code path. In one of the discussion emails about configuration files in CLI and RPC mode the following architecture was proposed: apply_config(global_conf) apply_config(user_conf) apply_config(pre_conf) parse_command_line() apply_rpc_options() apply_config(post_conf) And especially for the last step the getopt parsing needs to be out of main() and callable from the RPC code path. Signed-off-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
CC criu/cr-restore.o criu/cr-restore.c:3470:22: error: address of array 'thread_args[i].comm' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion] if (thread_args[i].comm) ~~ ~~~~~~~~~~~~~~~^~~~ 1 error generated. Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
This reverts commit 8f1ba5892dd2b137a24e144febed2464f245ed1a. This test doesn't work right now: =[log]=> dump/zdtm/transition/maps007/174/3/restore.log ------------------------ grep Error ------------------------ (00.237564) 1: `- FD 2 pid 6 (00.237566) 1: `- type 1 ID 0xa (00.237567) 1: `- FD 3 pid 5 (00.237568) 1: `- FD 3 pid 6 (00.240025) 1: Error (criu/image.c:432): Unable to open pages-3.img: Permission denied (00.270600) uns: calling exit_usernsd (-1, 1) (00.270640) uns: daemon calls 0x469f80 (199, -1, 1) (00.270648) uns: `- daemon exits w/ 0 (00.271193) uns: daemon stopped (00.271199) Error (criu/cr-restore.c:2308): Restoring FAILED. ------------------------ ERROR OVER ------------------------ Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
Fixes: e8f913fbfd9d ("unix: check that a length of a socket is less than UNIX_PATH_MAX") Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
Reported-by:
志平 林 <larry.lin@outlook.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
CID 190774 (#1 of 1): Out-of-bounds access (OVERRUN) 5. overrun-buffer-arg: Overrunning array addr.sun_path of 108 bytes by passing it to a function which accesses it at byte offset 4094 using argument ui->ue->name.len (which evaluates to 4095). Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
CID 190775 (#1 of 1): Dereference before null check (REVERSE_INULL) check_after_deref: Null-checking m->parent suggests that it may be null, but it has already been dereferenced on all paths leading to the check. Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Andrei Vagin authored
CID 190777 (#1 of 1): Resource leak (RESOURCE_LEAK) 15. leaked_handle: Handle variable server_fd going out of scope leaks the handle. Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Adrian Reber authored
Signed-off-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
The host compel-host-bin must be built before criu, same time the criu itself should not depend on libcompel or plugins because they are the part of the compel package. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
They were occasionally kept in obj-y. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Thus to choose which deps to include, for example if only particular file is being build there is no need to include any other deps. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Thus will include hostprogs deps only if requested. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
mrproper doesn't require inclusion of deps similar as clean target. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
We fully support xsaves, so no need for noxsaves temporary option anymore. This reverts commit ba93feb5f0f017f2ee498f6ee2db58bcaf817501. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
We fully support xsaves now, so no need for warning or any other message. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
arm's cpu code is the same as aarch64, so use the symlink. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
For debug sake Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
cpu extensions (such as avx-512) require bigger xsave area to keep fpu registers set, so we allocate a page per process to keep them all. On checkpoint we parse runtime fpu features and dump them into an image and do reverse on restore procedure. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
This feature will allow to catch incapability early if present in image. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-
Cyrill Gorcunov authored
- externd compel_cpuinfo_t to keep all fpu information neded for xsaves mode - fetch xsaves data in compel_cpuid All this will allow us to extend criu to support avx-512 intructions. Signed-off-by:
Cyrill Gorcunov <gorcunov@gmail.com> Reviewed-by:
Dmitry Safonov <0x7f454c46@gmail.com> Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com>
-