aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Berberian, Jr <jeb.study@gmail.com>2023-01-15 20:34:21 -0500
committerJuan Quintela <quintela@redhat.com>2023-03-02 17:06:27 +0100
commitc31772ad6883533757d2a7dfe9ce24325e3ec16c (patch)
tree1fd8797d43ad6bd390f2eb9e2524b03d7fe770b8
parentabe2c4bdb65e8dd9cb2f01c355baa394bf49a8af (diff)
downloadqemu-c31772ad6883533757d2a7dfe9ce24325e3ec16c.zip
qemu-c31772ad6883533757d2a7dfe9ce24325e3ec16c.tar.gz
qemu-c31772ad6883533757d2a7dfe9ce24325e3ec16c.tar.bz2
Fix exec migration on Windows (w32+w64).
* Use cmd instead of /bin/sh on Windows. * Try to auto-detect cmd.exe's path, but default to a hard-coded path. Note that this will require that gspawn-win[32|64]-helper.exe and gspawn-win[32|64]-helper-console.exe are included in the Windows binary distributions (cc: Stefan Weil). Signed-off-by: "John Berberian, Jr" <jeb.study@gmail.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r--migration/exec.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/migration/exec.c b/migration/exec.c
index 375d2e1..38604d7 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -23,12 +23,31 @@
#include "migration.h"
#include "io/channel-command.h"
#include "trace.h"
+#include "qemu/cutils.h"
+#ifdef WIN32
+const char *exec_get_cmd_path(void);
+const char *exec_get_cmd_path(void)
+{
+ g_autofree char *detected_path = g_new(char, MAX_PATH);
+ if (GetSystemDirectoryA(detected_path, MAX_PATH) == 0) {
+ warn_report("Could not detect cmd.exe path, using default.");
+ return "C:\\Windows\\System32\\cmd.exe";
+ }
+ pstrcat(detected_path, MAX_PATH, "\\cmd.exe");
+ return g_steal_pointer(&detected_path);
+}
+#endif
void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
{
QIOChannel *ioc;
+
+#ifdef WIN32
+ const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL };
+#else
const char *argv[] = { "/bin/sh", "-c", command, NULL };
+#endif
trace_migration_exec_outgoing(command);
ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,
@@ -55,7 +74,12 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
void exec_start_incoming_migration(const char *command, Error **errp)
{
QIOChannel *ioc;
+
+#ifdef WIN32
+ const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL };
+#else
const char *argv[] = { "/bin/sh", "-c", command, NULL };
+#endif
trace_migration_exec_incoming(command);
ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,