b8ef617993
One of big change is that QEMU has switched to Meson build system. That result in few changes to build scripts to fix python interpreter usage. Second change that it's not possible to select binaries to build, so now we have to build all targets at once (that require --enable-tools). Options --disable-sheepdog and --disable-vxhs was removed from qemu 6.1.0 and 6.0.0 accordingly. Signed-off-by: Vladimir Ermakov <vooon341@gmail.com>
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From 80ec6872aceb18c68b1cf5b6f8acd6ad667cbd4f Mon Sep 17 00:00:00 2001
|
|
From: Yousong Zhou <yszhou4tech@gmail.com>
|
|
Date: Thu, 17 Dec 2020 15:55:55 +0800
|
|
Subject: [PATCH] qga: invoke separate applets for guest-shutdown modes
|
|
|
|
/sbin/shutdown is not available on OpenWrt by default
|
|
|
|
Origin: "main/qemu: fix shutdown from guest agent"
|
|
https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf2df01c27790d
|
|
---
|
|
qga/commands-posix.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
--- a/qga/commands-posix.c
|
|
+++ b/qga/commands-posix.c
|
|
@@ -84,6 +84,7 @@ static void ga_wait_child(pid_t pid, int
|
|
void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)
|
|
{
|
|
const char *shutdown_flag;
|
|
+ const char *fallback_cmd = NULL;
|
|
Error *local_err = NULL;
|
|
pid_t pid;
|
|
int status;
|
|
@@ -91,10 +92,13 @@ void qmp_guest_shutdown(bool has_mode, c
|
|
slog("guest-shutdown called, mode: %s", mode);
|
|
if (!has_mode || strcmp(mode, "powerdown") == 0) {
|
|
shutdown_flag = "-P";
|
|
+ fallback_cmd = "/sbin/poweroff";
|
|
} else if (strcmp(mode, "halt") == 0) {
|
|
shutdown_flag = "-H";
|
|
+ fallback_cmd = "/sbin/halt";
|
|
} else if (strcmp(mode, "reboot") == 0) {
|
|
shutdown_flag = "-r";
|
|
+ fallback_cmd = "/sbin/reboot";
|
|
} else {
|
|
error_setg(errp,
|
|
"mode is invalid (valid values are: halt|powerdown|reboot");
|
|
@@ -111,6 +115,7 @@ void qmp_guest_shutdown(bool has_mode, c
|
|
|
|
execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
|
|
"hypervisor initiated shutdown", (char *)NULL, environ);
|
|
+ execle(fallback_cmd, fallback_cmd, (char*)NULL, environ);
|
|
_exit(EXIT_FAILURE);
|
|
} else if (pid < 0) {
|
|
error_setg_errno(errp, errno, "failed to create child process");
|