5e52895d07
Signed-off-by: Neil.wrz <wangrunze13@huawei.com> (cherry picked from commit 501afaa6657ba6cbb55eb3fbb8195f6566eacdd4)
89 lines
3.1 KiB
Diff
89 lines
3.1 KiB
Diff
From 17abc741624f084d5c2d7cf16acb28109bf0a72a Mon Sep 17 00:00:00 2001
|
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
Date: Fri, 5 May 2023 15:13:52 +0800
|
|
Subject: [PATCH 59/59] convert struct lcr start/exec request
|
|
|
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
---
|
|
.../modules/runtime/engines/lcr/lcr_engine.c | 58 +++++++++++++++++--
|
|
1 file changed, 54 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/daemon/modules/runtime/engines/lcr/lcr_engine.c b/src/daemon/modules/runtime/engines/lcr/lcr_engine.c
|
|
index 2ca12545..34292ce3 100644
|
|
--- a/src/daemon/modules/runtime/engines/lcr/lcr_engine.c
|
|
+++ b/src/daemon/modules/runtime/engines/lcr/lcr_engine.c
|
|
@@ -102,16 +102,66 @@ static bool lcr_update_container(const char *name, const char *lcrpath, const st
|
|
|
|
static bool lcr_start_container(const engine_start_request_t *request)
|
|
{
|
|
- struct lcr_start_request *lcr_request = (struct lcr_start_request *)request;
|
|
+ struct lcr_start_request lcr_request = { 0 };
|
|
|
|
- return g_lcr_start_op(lcr_request);
|
|
+ if (g_lcr_start_op == NULL) {
|
|
+ ERROR("Not supported start operation");
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ if (request == NULL) {
|
|
+ ERROR("Empty start request");
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ lcr_request.name = request->name;
|
|
+ lcr_request.lcrpath = request->lcrpath;
|
|
+ lcr_request.logpath = request->logpath;
|
|
+ lcr_request.loglevel = request->loglevel;
|
|
+ lcr_request.daemonize = request->daemonize;
|
|
+ lcr_request.tty = request->tty;
|
|
+ lcr_request.open_stdin = request->open_stdin;
|
|
+ lcr_request.console_fifos = request->console_fifos;
|
|
+ lcr_request.start_timeout = request->start_timeout;
|
|
+ lcr_request.container_pidfile = request->container_pidfile;
|
|
+ lcr_request.exit_fifo = request->exit_fifo;
|
|
+ lcr_request.image_type_oci = request->image_type_oci;
|
|
+
|
|
+ return g_lcr_start_op(&lcr_request);
|
|
}
|
|
|
|
static bool lcr_exec_container(const engine_exec_request_t *request, int *exit_code)
|
|
{
|
|
- struct lcr_exec_request *lcr_request = (struct lcr_exec_request *)request;
|
|
+ struct lcr_exec_request lcr_request = { 0 };
|
|
+
|
|
+ if (g_lcr_exec_op == NULL) {
|
|
+ ERROR("Not supported exec operation");
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ if (request == NULL) {
|
|
+ ERROR("Empty exec request");
|
|
+ return false;
|
|
+ }
|
|
|
|
- return g_lcr_exec_op(lcr_request, exit_code);
|
|
+ lcr_request.name = request->name;
|
|
+ lcr_request.lcrpath = request->lcrpath;
|
|
+ lcr_request.logpath = request->logpath;
|
|
+ lcr_request.loglevel = request->loglevel;
|
|
+ lcr_request.console_fifos = request->console_fifos;
|
|
+ lcr_request.user = request->user;
|
|
+ lcr_request.add_gids = request->add_gids;
|
|
+ lcr_request.env = request->env;
|
|
+ lcr_request.env_len = request->env_len;
|
|
+ lcr_request.args = request->args;
|
|
+ lcr_request.args_len = request->args_len;
|
|
+ lcr_request.timeout = request->timeout;
|
|
+ lcr_request.suffix = request->suffix;
|
|
+ lcr_request.tty = request->tty;
|
|
+ lcr_request.open_stdin = request->open_stdin;
|
|
+ lcr_request.workdir = (char *)request->workdir;
|
|
+
|
|
+ return g_lcr_exec_op(&lcr_request, exit_code);
|
|
}
|
|
|
|
/*
|
|
--
|
|
2.25.1
|
|
|