[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 11/22] migration: convert fd socket protocol to u
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v1 11/22] migration: convert fd socket protocol to use QIOChannel |
Date: |
Tue, 12 Jan 2016 11:44:05 +0000 |
Convert the fd socket migration protocol driver to use
QIOChannel and QEMUFileChannel, instead of plain sockets
APIs. It can be unconditionally built because the
QIOChannel APIs it uses will take care to report suitable
error messages if needed.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
migration/Makefile.objs | 4 ++--
migration/fd.c | 57 ++++++++++++++++++++++++++++++++-----------------
migration/migration.c | 4 ----
3 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/migration/Makefile.objs b/migration/Makefile.objs
index a5f8a03..64f95cd 100644
--- a/migration/Makefile.objs
+++ b/migration/Makefile.objs
@@ -1,11 +1,11 @@
-common-obj-y += migration.o tcp.o unix.o
+common-obj-y += migration.o tcp.o unix.o fd.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 fd.o
+common-obj-$(CONFIG_POSIX) += exec.o
common-obj-y += block.o
diff --git a/migration/fd.c b/migration/fd.c
index 3e4bed0..8d48e0d 100644
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -20,6 +20,8 @@
#include "monitor/monitor.h"
#include "migration/qemu-file.h"
#include "block/block.h"
+#include "io/channel-file.h"
+#include "io/channel-socket.h"
//#define DEBUG_MIGRATION_FD
@@ -33,56 +35,71 @@
static bool fd_is_socket(int fd)
{
- struct stat stat;
- int ret = fstat(fd, &stat);
- if (ret == -1) {
- /* When in doubt say no */
- return false;
- }
- return S_ISSOCK(stat.st_mode);
+ int optval;
+ socklen_t optlen;
+ optlen = sizeof(optval);
+ return getsockopt(fd,
+ SOL_SOCKET,
+ SO_TYPE,
+ (char *)&optval,
+ &optlen) == 0;
}
void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error
**errp)
{
+ QIOChannel *ioc;
int fd = monitor_get_fd(cur_mon, fdname, errp);
if (fd == -1) {
return;
}
if (fd_is_socket(fd)) {
- s->file = qemu_fopen_socket(fd, "wb");
+ ioc = QIO_CHANNEL(qio_channel_socket_new_fd(fd, errp));
+ if (!ioc) {
+ close(fd);
+ return;
+ }
} else {
- s->file = qemu_fdopen(fd, "wb");
+ ioc = QIO_CHANNEL(qio_channel_file_new_fd(fd));
}
+ s->file = qemu_fopen_channel_output(ioc);
migrate_fd_connect(s);
}
-static void fd_accept_incoming_migration(void *opaque)
+static gboolean fd_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);
+ return FALSE;
}
void fd_start_incoming_migration(const char *infd, Error **errp)
{
- int fd;
QEMUFile *f;
+ QIOChannel *ioc;
+ int fd;
DPRINTF("Attempting to start an incoming migration via fd\n");
fd = strtol(infd, NULL, 0);
if (fd_is_socket(fd)) {
- f = qemu_fopen_socket(fd, "rb");
+ ioc = QIO_CHANNEL(qio_channel_socket_new_fd(fd, errp));
+ if (!ioc) {
+ close(fd);
+ return;
+ }
} else {
- f = qemu_fdopen(fd, "rb");
- }
- if(f == NULL) {
- error_setg_errno(errp, errno, "failed to open the source descriptor");
- return;
+ ioc = QIO_CHANNEL(qio_channel_file_new_fd(fd));
}
+ f = qemu_fopen_channel_input(ioc);
+ object_unref(OBJECT(ioc));
- qemu_set_fd_handler(fd, fd_accept_incoming_migration, NULL, f);
+ qio_channel_add_watch(ioc,
+ G_IO_IN,
+ fd_accept_incoming_migration,
+ f,
+ NULL);
}
diff --git a/migration/migration.c b/migration/migration.c
index 1c5f12e..211879e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -315,10 +315,8 @@ void qemu_start_incoming_migration(const char *uri, Error
**errp)
#endif
} else if (strstart(uri, "unix:", &p)) {
unix_start_incoming_migration(p, errp);
-#if !defined(WIN32)
} else if (strstart(uri, "fd:", &p)) {
fd_start_incoming_migration(p, errp);
-#endif
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
}
@@ -1022,10 +1020,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
#endif
} else if (strstart(uri, "unix:", &p)) {
unix_start_outgoing_migration(s, p, &local_err);
-#if !defined(WIN32)
} else if (strstart(uri, "fd:", &p)) {
fd_start_outgoing_migration(s, p, &local_err);
-#endif
} else {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
"a valid migration protocol");
--
2.5.0
- [Qemu-devel] [PATCH v1 05/22] migration: introduce set_blocking function in QEMUFileOps, (continued)
- [Qemu-devel] [PATCH v1 05/22] migration: introduce set_blocking function in QEMUFileOps, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 06/22] migration: force QEMUFile to blocking mode for outgoing migration, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 07/22] migration: introduce a new QEMUFile impl based on QIOChannel, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 09/22] migration: convert unix socket protocol to use QIOChannel, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 14/22] migration: convert savevm to use QIOChannel for writing to files, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 08/22] migration: convert post-copy to use QIOChannelBuffer, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 15/22] migration: delete QEMUFile buffer implementation, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 16/22] migration: delete QEMUSizedBuffer struct, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 10/22] migration: convert tcp socket protocol to use QIOChannel, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 12/22] migration: convert exec socket protocol to use QIOChannel, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 11/22] migration: convert fd socket protocol to use QIOChannel,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v1 17/22] migration: delete QEMUFile sockets implementation, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 13/22] migration: convert RDMA to use QIOChannel interface, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 19/22] migration: move definition of struct QEMUFile back into qemu-file.c, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 18/22] migration: delete QEMUFile stdio implementation, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 20/22] migration: support TLS encryption with TCP migration backend, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 21/22] migration: remove support for non-iovec based write handlers, Daniel P. Berrange, 2016/01/12
- [Qemu-devel] [PATCH v1 22/22] migration: remove qemu_get_fd method from QEMUFile, Daniel P. Berrange, 2016/01/12
- Re: [Qemu-devel] [PATCH v1 00/22] Convert migration to QIOChannel & support TLS, Daniel P. Berrange, 2016/01/12
- Re: [Qemu-devel] [PATCH v1 00/22] Convert migration to QIOChannel & support TLS, Daniel P. Berrange, 2016/01/20