[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V1 20/32] vl: add helper to request re-exec
From: |
Steve Sistare |
Subject: |
[PATCH V1 20/32] vl: add helper to request re-exec |
Date: |
Thu, 30 Jul 2020 08:14:24 -0700 |
Add a qemu_exec_requested() hook that causes the main loop to exit and
re-exec qemu using the same initial arguments. If /usr/bin/qemu-exec
exists, exec that instead. This is an optional site-specific trampoline
that may alter the environment before exec'ing the qemu binary.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
include/sysemu/sysemu.h | 1 +
softmmu/vl.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 5360da5..4dfc4ca 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -15,6 +15,7 @@ extern QemuUUID qemu_uuid;
extern bool qemu_uuid_set;
void qemu_add_data_dir(const char *path);
+void qemu_system_exec_request(void);
void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify);
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 7016e39..72f0e08 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -116,6 +116,7 @@
#define MAX_VIRTIO_CONSOLES 1
+static char **argv_main;
static const char *data_dir[16];
static int data_dir_idx;
const char *bios_name = NULL;
@@ -1296,6 +1297,7 @@ static ShutdownCause reset_requested;
static ShutdownCause shutdown_requested;
static int shutdown_signal;
static pid_t shutdown_pid;
+static int exec_requested;
static int powerdown_requested;
static int debug_requested;
static int suspend_requested;
@@ -1326,6 +1328,11 @@ static int qemu_shutdown_requested(void)
return atomic_xchg(&shutdown_requested, SHUTDOWN_CAUSE_NONE);
}
+static int qemu_exec_requested(void)
+{
+ return atomic_xchg(&exec_requested, 0);
+}
+
static void qemu_kill_report(void)
{
if (!qtest_driver() && shutdown_signal) {
@@ -1582,6 +1589,13 @@ void qemu_system_shutdown_request(ShutdownCause reason)
qemu_notify_event();
}
+void qemu_system_exec_request(void)
+{
+ shutdown_requested = 1;
+ exec_requested = 1;
+ qemu_notify_event();
+}
+
static void qemu_system_powerdown(void)
{
qapi_event_send_powerdown();
@@ -1617,6 +1631,16 @@ void qemu_system_debug_request(void)
qemu_notify_event();
}
+static void qemu_exec(void)
+{
+ const char *helper = "/usr/bin/qemu-exec";
+ const char *bin = !access(helper, X_OK) ? helper : argv_main[0];
+
+ execvp(bin, argv_main);
+ error_report("execvp failed, errno %d.", errno);
+ exit(1);
+}
+
static bool main_loop_should_exit(void)
{
RunState r;
@@ -1637,6 +1661,11 @@ static bool main_loop_should_exit(void)
}
request = qemu_shutdown_requested();
if (request) {
+
+ if (qemu_exec_requested()) {
+ qemu_exec();
+ /* not reached */
+ }
qemu_kill_report();
qemu_system_shutdown(request);
if (no_shutdown) {
@@ -2891,6 +2920,7 @@ void qemu_init(int argc, char **argv, char **envp)
os_set_line_buffering();
+ argv_main = argv;
error_init(argv[0]);
module_call_init(MODULE_INIT_TRACE);
--
1.8.3.1
- Re: [PATCH V1 12/32] vl: pause option, (continued)
[PATCH V1 14/32] savevm: VMS_RESTART and cprsave restart, Steve Sistare, 2020/07/30
[PATCH V1 15/32] vl: QEMU_START_FREEZE env var, Steve Sistare, 2020/07/30
[PATCH V1 16/32] oslib: add qemu_clr_cloexec, Steve Sistare, 2020/07/30
[PATCH V1 17/32] util: env var helpers, Steve Sistare, 2020/07/30
[PATCH V1 20/32] vl: add helper to request re-exec,
Steve Sistare <=
[PATCH V1 22/32] char: qio_channel_socket_accept reuse fd, Steve Sistare, 2020/07/30
[PATCH V1 28/32] char: restore terminal on restart, Steve Sistare, 2020/07/30
[PATCH V1 29/32] pci: export pci_update_mappings, Steve Sistare, 2020/07/30
[PATCH V1 25/32] char: save/restore chardev pty fds, Steve Sistare, 2020/07/30
[PATCH V1 24/32] ui: save/restore vnc socket fds, Steve Sistare, 2020/07/30
[PATCH V1 31/32] vfio-pci: trace pci config, Steve Sistare, 2020/07/30
[PATCH V1 02/32] savevm: VM handlers mode mask, Steve Sistare, 2020/07/30
[PATCH V1 05/32] savevm: QMP command for cprload, Steve Sistare, 2020/07/30