[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/7] qga/commands-posix: use ga_run_command helper when suspen
From: |
Andrey Drobyshev |
Subject: |
[PATCH v2 6/7] qga/commands-posix: use ga_run_command helper when suspending via sysfs |
Date: |
Fri, 1 Mar 2024 19:28:57 +0200 |
We replace the direct call to open() with a "sh -c 'echo ...'" call, so
that it becomes an executable command.
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
---
qga/commands-posix.c | 36 ++++--------------------------------
1 file changed, 4 insertions(+), 32 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index dd2a7ad2e6..f3f4a05e2d 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -1921,49 +1921,21 @@ static void linux_sys_state_suspend(SuspendMode mode,
Error **errp)
Error *local_err = NULL;
const char *sysfile_strs[3] = {"disk", "mem", NULL};
const char *sysfile_str = sysfile_strs[mode];
- pid_t pid;
- int status;
if (!sysfile_str) {
error_setg(errp, "unknown guest suspend mode");
return;
}
- pid = fork();
- if (!pid) {
- /* child */
- int fd;
-
- setsid();
- reopen_fd_to_null(0);
- reopen_fd_to_null(1);
- reopen_fd_to_null(2);
-
- fd = open(LINUX_SYS_STATE_FILE, O_WRONLY);
- if (fd < 0) {
- _exit(EXIT_FAILURE);
- }
-
- if (write(fd, sysfile_str, strlen(sysfile_str)) < 0) {
- _exit(EXIT_FAILURE);
- }
-
- _exit(EXIT_SUCCESS);
- } else if (pid < 0) {
- error_setg_errno(errp, errno, "failed to create child process");
- return;
- }
+ g_autofree char *echo_cmd = g_strdup_printf(
+ "echo %s > " LINUX_SYS_STATE_FILE, sysfile_str);
+ const char *argv[] = {"sh", "-c", echo_cmd, NULL};
- ga_wait_child(pid, &status, &local_err);
+ ga_run_command(argv, NULL, "suspend", &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
}
-
- if (WEXITSTATUS(status)) {
- error_setg(errp, "child process has failed to suspend");
- }
-
}
static void guest_suspend(SuspendMode mode, Error **errp)
--
2.39.3
- [PATCH v2 0/7] qga/commands-posix: replace code duplicating commands with a helper, Andrey Drobyshev, 2024/03/01
- [PATCH v2 6/7] qga/commands-posix: use ga_run_command helper when suspending via sysfs,
Andrey Drobyshev <=
- [PATCH v2 5/7] qga/commands-posix: execute_fsfreeze_hook: use ga_run_command helper, Andrey Drobyshev, 2024/03/01
- [PATCH v2 2/7] qga: introduce ga_run_command() helper for guest cmd execution, Andrey Drobyshev, 2024/03/01
- [PATCH v2 1/7] qga: guest-get-fsinfo: add optional 'total-bytes-root' field, Andrey Drobyshev, 2024/03/01
- [PATCH v2 4/7] qga/commands-posix: qmp_guest_set_time: use ga_run_command helper, Andrey Drobyshev, 2024/03/01
- [PATCH v2 3/7] qga/commands-posix: qmp_guest_shutdown: use ga_run_command helper, Andrey Drobyshev, 2024/03/01
- [PATCH v2 7/7] qga/commands-posix: qmp_guest_set_user_password: use ga_run_command helper, Andrey Drobyshev, 2024/03/01