ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
John Berberian, Jr 2023-01-15 20:34:21 -05:00 committed by Juan Quintela
parent abe2c4bdb6
commit c31772ad68
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
migration/exec.c
View File

@ -23,12 +23,31 @@
#include "migration.h" #include "migration.h"
#include "io/channel-command.h" #include "io/channel-command.h"
#include "trace.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) void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
{ {
QIOChannel *ioc; QIOChannel *ioc;
#ifdef WIN32
const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL };
#else
const char *argv[] = { "/bin/sh", "-c", command, NULL }; const char *argv[] = { "/bin/sh", "-c", command, NULL };
#endif
trace_migration_exec_outgoing(command); trace_migration_exec_outgoing(command);
ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv, 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) void exec_start_incoming_migration(const char *command, Error **errp)
{ {
QIOChannel *ioc; QIOChannel *ioc;
#ifdef WIN32
const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL };
#else
const char *argv[] = { "/bin/sh", "-c", command, NULL }; const char *argv[] = { "/bin/sh", "-c", command, NULL };
#endif
trace_migration_exec_incoming(command); trace_migration_exec_incoming(command);
ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv, ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,