[CRIU] [PATCH 1/5] compel: nuke compel_main()
Kir Kolyshkin
kir at openvz.org
Sat Mar 4 21:42:47 PST 2017
It is not used anywhere, so unless someone has any plans, let's kill it.
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
compel/plugins/std/std.c | 5 -----
compel/test/infect/parasite.c | 1 -
criu/pie/parasite.c | 5 -----
criu/pie/restorer.c | 5 -----
4 files changed, 16 deletions(-)
diff --git a/compel/plugins/std/std.c b/compel/plugins/std/std.c
index 705629f..e326ef7 100644
--- a/compel/plugins/std/std.c
+++ b/compel/plugins/std/std.c
@@ -5,8 +5,6 @@
#include "asm/prologue.h"
-extern int compel_main(void *arg_p, unsigned int arg_s);
-
static struct prologue_init_args *init_args;
static int ctl_socket = -1;
@@ -73,9 +71,6 @@ int __export_std_compel_start(struct prologue_init_args *args,
}
}
- if (!ret)
- ret = compel_main(args->arg_p, args->arg_s);
-
for (; i > 0; i--) {
const plugin_init_t *d = init_array[i - 1];
diff --git a/compel/test/infect/parasite.c b/compel/test/infect/parasite.c
index baecc0e..68bf1f7 100644
--- a/compel/test/infect/parasite.c
+++ b/compel/test/infect/parasite.c
@@ -9,7 +9,6 @@
/*
* Stubs for std compel plugin.
*/
-int compel_main(void *arg_p, unsigned int arg_s) { return 0; }
int parasite_trap_cmd(int cmd, void *args) { return 0; }
void parasite_cleanup(void) { }
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index e84d634..fe08e72 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -24,11 +24,6 @@
#include "restorer.h"
#include "infect-pie.h"
-int compel_main(void *arg_p, unsigned int arg_s)
-{
- return 0;
-}
-
/*
* PARASITE_CMD_DUMPPAGES is called many times and the parasite args contains
* an array of VMAs at this time, so VMAs can be unprotected in any moment
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 1df5e20..42cfe15 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -74,11 +74,6 @@ bool fault_injected(enum faults f)
/*
* These are stubs for std compel plugin.
*/
-int compel_main(void *arg_p, unsigned int arg_s)
-{
- return 0;
-}
-
int parasite_daemon_cmd(int cmd, void *args)
{
return 0;
--
2.9.3
More information about the CRIU
mailing list