[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 15/27] migration: convert exec socket protocol to
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v3 15/27] migration: convert exec socket protocol to use QIOChannel |
Date: |
Fri, 26 Feb 2016 15:10:18 +0000 |
Convert the exec socket migration protocol driver to use
QIOChannel and QEMUFileChannel, instead of the stdio
popen APIs. It can be unconditionally built because the
QIOChannelCommand class can report suitable error messages
on platforms which can't fork processes.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
migration/Makefile.objs | 3 +--
migration/exec.c | 63 +++++++++++++++++++++++++------------------------
migration/migration.c | 4 ----
trace-events | 4 ++++
4 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/migration/Makefile.objs b/migration/Makefile.objs
index 0987bb6..86dd050 100644
--- a/migration/Makefile.objs
+++ b/migration/Makefile.objs
@@ -1,11 +1,10 @@
-common-obj-y += migration.o socket.o fd.o
+common-obj-y += migration.o socket.o fd.o exec.o
common-obj-y += vmstate.o
common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o
common-obj-y += qemu-file-channel.o
common-obj-y += xbzrle.o postcopy-ram.o
common-obj-$(CONFIG_RDMA) += rdma.o
-common-obj-$(CONFIG_POSIX) += exec.o
common-obj-y += block.o
diff --git a/migration/exec.c b/migration/exec.c
index 62f892d..4f439b4 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -3,10 +3,12 @@
*
* Copyright IBM, Corp. 2008
* Copyright Dell MessageOne 2008
+ * Copyright Red Hat, Inc. 2015-2016
*
* Authors:
* Anthony Liguori <address@hidden>
* Charles Duffy <address@hidden>
+ * Daniel P. Berrange <address@hidden>
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
@@ -16,54 +18,53 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/sockets.h"
-#include "qemu/main-loop.h"
#include "migration/migration.h"
-#include "migration/qemu-file.h"
-#include "block/block.h"
-#include <sys/wait.h>
+#include "io/channel-command.h"
+#include "trace.h"
-//#define DEBUG_MIGRATION_EXEC
-
-#ifdef DEBUG_MIGRATION_EXEC
-#define DPRINTF(fmt, ...) \
- do { printf("migration-exec: " fmt, ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...) \
- do { } while (0)
-#endif
void exec_start_outgoing_migration(MigrationState *s, const char *command,
Error **errp)
{
- s->to_dst_file = qemu_popen_cmd(command, "w");
- if (s->to_dst_file == NULL) {
- error_setg_errno(errp, errno, "failed to popen the migration target");
+ QIOChannel *ioc;
+ const char *argv[] = { "/bin/sh", "-c", command, NULL };
+
+ trace_migration_exec_outgoing(command);
+ ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,
+ O_WRONLY,
+ errp));
+ if (!ioc) {
return;
}
- migrate_fd_connect(s);
+ migration_set_outgoing_channel(s, ioc);
+ object_unref(OBJECT(ioc));
}
-static void exec_accept_incoming_migration(void *opaque)
+static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
+ GIOCondition condition,
+ gpointer opaque)
{
- QEMUFile *f = opaque;
-
- qemu_set_fd_handler(qemu_get_fd(f), NULL, NULL, NULL);
- process_incoming_migration(f);
+ migration_set_incoming_channel(migrate_get_current(), ioc);
+ object_unref(OBJECT(ioc));
+ return FALSE; /* unregister */
}
void exec_start_incoming_migration(const char *command, Error **errp)
{
- QEMUFile *f;
+ QIOChannel *ioc;
+ const char *argv[] = { "/bin/sh", "-c", command, NULL };
- DPRINTF("Attempting to start an incoming migration\n");
- f = qemu_popen_cmd(command, "r");
- if(f == NULL) {
- error_setg_errno(errp, errno, "failed to popen the migration source");
+ trace_migration_exec_incoming(command);
+ ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv,
+ O_RDONLY,
+ errp));
+ if (!ioc) {
return;
}
- qemu_set_fd_handler(qemu_get_fd(f), exec_accept_incoming_migration, NULL,
- f);
+ qio_channel_add_watch(ioc,
+ G_IO_IN,
+ exec_accept_incoming_migration,
+ NULL,
+ NULL);
}
diff --git a/migration/migration.c b/migration/migration.c
index bbbd381..e90a14f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -311,10 +311,8 @@ void qemu_start_incoming_migration(const char *uri, Error
**errp)
} else if (strstart(uri, "rdma:", &p)) {
rdma_start_incoming_migration(p, errp);
#endif
-#if !defined(WIN32)
} else if (strstart(uri, "exec:", &p)) {
exec_start_incoming_migration(p, errp);
-#endif
} else if (strstart(uri, "unix:", &p)) {
unix_start_incoming_migration(p, errp);
} else if (strstart(uri, "fd:", &p)) {
@@ -1047,10 +1045,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
} else if (strstart(uri, "rdma:", &p)) {
rdma_start_outgoing_migration(s, p, &local_err);
#endif
-#if !defined(WIN32)
} else if (strstart(uri, "exec:", &p)) {
exec_start_outgoing_migration(s, p, &local_err);
-#endif
} else if (strstart(uri, "unix:", &p)) {
unix_start_outgoing_migration(s, p, &local_err);
} else if (strstart(uri, "fd:", &p)) {
diff --git a/trace-events b/trace-events
index 90afcff..5b8da12 100644
--- a/trace-events
+++ b/trace-events
@@ -1600,6 +1600,10 @@ postcopy_ram_incoming_cleanup_entry(void) ""
postcopy_ram_incoming_cleanup_exit(void) ""
postcopy_ram_incoming_cleanup_join(void) ""
+# migration/exec.c
+migration_exec_outgoing(const char *cmd) "cmd=%s"
+migration_exec_incoming(const char *cmd) "cmd=%s"
+
# migration/fd.c
migration_fd_outgoing(int fd) "fd=%d"
migration_fd_incoming(int fd) "fd=%d"
--
2.5.0
- [Qemu-devel] [PATCH v3 06/27] migration: force QEMUFile to blocking mode for outgoing migration, (continued)
- [Qemu-devel] [PATCH v3 06/27] migration: force QEMUFile to blocking mode for outgoing migration, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 09/27] migration: add reporting of errors for outgoing migration, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 14/27] migration: convert fd socket protocol to use QIOChannel, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 11/27] migration: convert unix socket protocol to use QIOChannel, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 12/27] migration: rename unix.c to socket.c, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 10/27] migration: convert post-copy to use QIOChannelBuffer, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 13/27] migration: convert tcp socket protocol to use QIOChannel, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 16/27] migration: convert RDMA to use QIOChannel interface, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 20/27] migration: delete QEMUFile sockets implementation, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 18/27] migration: delete QEMUFile buffer implementation, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 15/27] migration: convert exec socket protocol to use QIOChannel,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v3 17/27] migration: convert savevm to use QIOChannel for writing to files, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 21/27] migration: delete QEMUFile stdio implementation, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 19/27] migration: delete QEMUSizedBuffer struct, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 23/27] migration: don't use an array for storing migrate parameters, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 24/27] migration: define 'tls-creds' and 'tls-hostname' migration parameters, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 27/27] migration: remove qemu_get_fd method from QEMUFile, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 22/27] migration: move definition of struct QEMUFile back into qemu-file.c, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 26/27] migration: remove support for non-iovec based write handlers, Daniel P. Berrange, 2016/02/26
- [Qemu-devel] [PATCH v3 25/27] migration: add support for encrypting data with TLS, Daniel P. Berrange, 2016/02/26