[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 30/32] qga: remove explicit environ argument from exec/spawn
From: |
marcandre . lureau |
Subject: |
[PATCH 30/32] qga: remove explicit environ argument from exec/spawn |
Date: |
Wed, 23 Mar 2022 19:57:41 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Environment is implicitly inherited from the current process "environ"
variable for execl() or g_spawn_sync(), no need to be explicit about it.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
meson.build | 2 --
qga/commands-posix.c | 24 +++++++-----------------
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/meson.build b/meson.build
index e03a1b50cc11..c06fe5e02737 100644
--- a/meson.build
+++ b/meson.build
@@ -1654,8 +1654,6 @@ config_host_data.set('CONFIG_BYTESWAP_H',
cc.has_header_symbol('byteswap.h', 'bswap_32'))
config_host_data.set('CONFIG_EPOLL_CREATE1',
cc.has_header_symbol('sys/epoll.h', 'epoll_create1'))
-config_host_data.set('CONFIG_HAS_ENVIRON',
- cc.has_header_symbol('unistd.h', 'environ', prefix:
gnu_source_prefix))
config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE',
cc.has_header_symbol('linux/falloc.h',
'FALLOC_FL_PUNCH_HOLE') and
cc.has_header_symbol('linux/falloc.h',
'FALLOC_FL_KEEP_SIZE'))
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 75dbaab68ea9..4d7a2392c097 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -32,15 +32,6 @@
#include <utmpx.h>
#endif
-#ifndef CONFIG_HAS_ENVIRON
-#ifdef __APPLE__
-#include <crt_externs.h>
-#define environ (*_NSGetEnviron())
-#else
-extern char **environ;
-#endif
-#endif
-
#if defined(__linux__)
#include <mntent.h>
#include <linux/fs.h>
@@ -109,8 +100,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode,
Error **errp)
reopen_fd_to_null(1);
reopen_fd_to_null(2);
- execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
- "hypervisor initiated shutdown", (char *)NULL, environ);
+ execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
+ "hypervisor initiated shutdown", (char *)NULL);
_exit(EXIT_FAILURE);
} else if (pid < 0) {
error_setg_errno(errp, errno, "failed to create child process");
@@ -207,8 +198,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns,
Error **errp)
/* Use '/sbin/hwclock -w' to set RTC from the system time,
* or '/sbin/hwclock -s' to set the system time from RTC. */
- execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",
- NULL, environ);
+ execl(hwclock_path, "hwclock", has_time ? "-w" : "-s", NULL);
_exit(EXIT_FAILURE);
} else if (pid < 0) {
error_setg_errno(errp, errno, "failed to create child process");
@@ -1574,7 +1564,7 @@ static void execute_fsfreeze_hook(FsfreezeHookArg arg,
Error **errp)
reopen_fd_to_null(1);
reopen_fd_to_null(2);
- execle(hook, hook, arg_str, NULL, environ);
+ execl(hook, hook, arg_str, NULL);
_exit(EXIT_FAILURE);
} else if (pid < 0) {
error_setg_errno(errp, errno, "failed to create child process");
@@ -1888,7 +1878,7 @@ static int run_process_child(const char *command[], Error
**errp)
spawn_flag = G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL |
G_SPAWN_STDERR_TO_DEV_NULL;
- success = g_spawn_sync(NULL, (char **)command, environ, spawn_flag,
+ success = g_spawn_sync(NULL, (char **)command, NULL, spawn_flag,
NULL, NULL, NULL, NULL,
&exit_status, &g_err);
@@ -2569,9 +2559,9 @@ void qmp_guest_set_user_password(const char *username,
reopen_fd_to_null(2);
if (crypted) {
- execle(passwd_path, "chpasswd", "-e", NULL, environ);
+ execl(passwd_path, "chpasswd", "-e", NULL);
} else {
- execle(passwd_path, "chpasswd", NULL, environ);
+ execl(passwd_path, "chpasswd", NULL);
}
_exit(EXIT_FAILURE);
} else if (pid < 0) {
--
2.35.1.273.ge6ebfd0e8cbb
- Re: [PATCH 24/32] include: move progress API to qemu-progress.h, (continued)
- [PATCH 25/32] include: move qemu_get_vm_name() to sysemu.h, marcandre . lureau, 2022/03/23
- [PATCH 26/32] include: move os_*() to os-foo.h, marcandre . lureau, 2022/03/23
- [PATCH 29/32] Move fcntl_setfl() to oslib-posix, marcandre . lureau, 2022/03/23
- [PATCH 27/32] include: move page_size_init() to include/hw/core/cpu.h, marcandre . lureau, 2022/03/23
- [PATCH 28/32] Move CPU softfloat unions to cpu-float.h, marcandre . lureau, 2022/03/23
- [PATCH 30/32] qga: remove explicit environ argument from exec/spawn,
marcandre . lureau <=
- [PATCH 31/32] RFC: Simplify softmmu/main.c, marcandre . lureau, 2022/03/23
- [PATCH 32/32] Remove qemu-common.h include from most units, marcandre . lureau, 2022/03/23
- Re: [PATCH 00/32] Misc cleanups, Stefan Hajnoczi, 2022/03/24