From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXWdR-0005a4-Qo for qemu-devel@nongnu.org; Thu, 03 Sep 2015 11:41:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXWdN-0008DL-Ho for qemu-devel@nongnu.org; Thu, 03 Sep 2015 11:41:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXWdN-0008D9-85 for qemu-devel@nongnu.org; Thu, 03 Sep 2015 11:41:05 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id ECD92C0B2B58 for ; Thu, 3 Sep 2015 15:41:04 +0000 (UTC) From: "Daniel P. Berrange" Date: Thu, 3 Sep 2015 16:39:19 +0100 Message-Id: <1441294768-8712-38-git-send-email-berrange@redhat.com> In-Reply-To: <1441294768-8712-1-git-send-email-berrange@redhat.com> References: <1441294768-8712-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH FYI 37/46] migration: convert unix socket protocol to use QIOChannel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Juan Quintela , "Dr. David Alan Gilbert" , Gerd Hoffmann , Amit Shah , Paolo Bonzini Convert the unix socket migration protocol driver to use QIOChannel and QEMUFileChannel, instead of plain sockets APIs. It can be unconditionally built, since the socket impl of QIOChannel will report a suitable error on platforms where UNIX sockets are unavailable. Signed-off-by: Daniel P. Berrange --- migration/Makefile.objs | 4 +- migration/migration.c | 4 ++ migration/unix.c | 103 +++++++++++++++++++++++++++++++----------------- 3 files changed, 72 insertions(+), 39 deletions(-) diff --git a/migration/Makefile.objs b/migration/Makefile.objs index 32fd449..521a83b 100644 --- a/migration/Makefile.objs +++ b/migration/Makefile.objs @@ -1,11 +1,11 @@ -common-obj-y += migration.o tcp.o +common-obj-y += migration.o tcp.o unix.o common-obj-y += vmstate.o common-obj-y += qemu-file.o qemu-file-unix.o qemu-file-stdio.o common-obj-y += qemu-file-channel.o common-obj-y += xbzrle.o common-obj-$(CONFIG_RDMA) += rdma.o -common-obj-$(CONFIG_POSIX) += exec.o unix.o fd.o +common-obj-$(CONFIG_POSIX) += exec.o fd.o common-obj-y += block.o diff --git a/migration/migration.c b/migration/migration.c index aa24a7a..bd7024f 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -256,8 +256,10 @@ void qemu_start_incoming_migration(const char *uri, Error **errp) #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); +#if !defined(WIN32) } else if (strstart(uri, "fd:", &p)) { fd_start_incoming_migration(p, errp); #endif @@ -747,8 +749,10 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, #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); +#if !defined(WIN32) } else if (strstart(uri, "fd:", &p)) { fd_start_outgoing_migration(s, p, &local_err); #endif diff --git a/migration/unix.c b/migration/unix.c index b591813..4263ad1 100644 --- a/migration/unix.c +++ b/migration/unix.c @@ -1,10 +1,11 @@ /* * QEMU live migration via Unix Domain Sockets * - * Copyright Red Hat, Inc. 2009 + * Copyright Red Hat, Inc. 2009-2015 * * Authors: * Chris Lalancette + * Daniel P. Berrange * * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. @@ -17,11 +18,9 @@ #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/sockets.h" -#include "qemu/main-loop.h" #include "migration/migration.h" #include "migration/qemu-file.h" -#include "block/block.h" +#include "io/channel-socket.h" //#define DEBUG_MIGRATION_UNIX @@ -33,71 +32,101 @@ do { } while (0) #endif -static void unix_wait_for_connect(int fd, Error *err, void *opaque) + +static SocketAddress *unix_build_address(const char *path) +{ + SocketAddress *saddr; + + saddr = g_new0(SocketAddress, 1); + saddr->kind = SOCKET_ADDRESS_KIND_UNIX; + saddr->q_unix = g_new0(UnixSocketAddress, 1); + saddr->q_unix->path = g_strdup(path); + + return saddr; +} + + +static void unix_outgoing_migration(Object *src, + Error *err, + gpointer opaque) { MigrationState *s = opaque; + QIOChannel *sioc = QIO_CHANNEL(src); - if (fd < 0) { + if (err) { DPRINTF("migrate connect error: %s\n", error_get_pretty(err)); s->file = NULL; migrate_fd_error(s); } else { DPRINTF("migrate connect success\n"); - s->file = qemu_fopen_socket(fd, "wb"); + s->file = qemu_fopen_channel_output(sioc); migrate_fd_connect(s); } + object_unref(src); } + void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) { - unix_nonblocking_connect(path, unix_wait_for_connect, s, errp); + SocketAddress *saddr = unix_build_address(path); + QIOChannelSocket *sioc; + sioc = qio_channel_socket_new(); + qio_channel_socket_connect_async(sioc, + saddr, + unix_outgoing_migration, + s, + NULL); + qapi_free_SocketAddress(saddr); } -static void unix_accept_incoming_migration(void *opaque) + +static gboolean unix_accept_incoming_migration(QIOChannel *ioc, + GIOCondition condition, + gpointer opaque) { - struct sockaddr_un addr; - socklen_t addrlen = sizeof(addr); - int s = (intptr_t)opaque; QEMUFile *f; - int c, err; - - do { - c = qemu_accept(s, (struct sockaddr *)&addr, &addrlen); - err = errno; - } while (c < 0 && err == EINTR); - qemu_set_fd_handler(s, NULL, NULL, NULL); - close(s); + QIOChannelSocket *cioc; + Error *err = NULL; - DPRINTF("accepted migration\n"); - - if (c < 0) { + cioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), + &err); + if (!cioc) { error_report("could not accept migration connection (%s)", - strerror(err)); - return; - } - - f = qemu_fopen_socket(c, "rb"); - if (f == NULL) { - error_report("could not qemu_fopen socket"); + error_get_pretty(err)); goto out; } + DPRINTF("accepted migration\n"); + + f = qemu_fopen_channel_input(QIO_CHANNEL(cioc)); + object_unref(OBJECT(cioc)); + process_incoming_migration(f); - return; out: - close(c); + /* Close listening socket as its no longer needed */ + qio_channel_close(ioc, NULL); + return FALSE; } + void unix_start_incoming_migration(const char *path, Error **errp) { - int s; + SocketAddress *saddr = unix_build_address(path); + QIOChannelSocket *listen_ioc; - s = unix_listen(path, NULL, 0, errp); - if (s < 0) { + listen_ioc = qio_channel_socket_new(); + if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) { + object_unref(OBJECT(listen_ioc)); + qapi_free_SocketAddress(saddr); return; } - qemu_set_fd_handler(s, unix_accept_incoming_migration, NULL, - (void *)(intptr_t)s); + qio_channel_add_watch(QIO_CHANNEL(listen_ioc), + G_IO_IN, + unix_accept_incoming_migration, + listen_ioc, + (GDestroyNotify)object_unref); + + qapi_free_SocketAddress(saddr); } -- 2.4.3