From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agvRB-0008Qt-VD for qemu-devel@nongnu.org; Fri, 18 Mar 2016 10:31:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agvRA-0002Hm-J6 for qemu-devel@nongnu.org; Fri, 18 Mar 2016 10:31:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agvRA-0002G6-9y for qemu-devel@nongnu.org; Fri, 18 Mar 2016 10:31:36 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 023B7C05005F for ; Fri, 18 Mar 2016 14:31:36 +0000 (UTC) From: "Daniel P. Berrange" Date: Fri, 18 Mar 2016 14:30:47 +0000 Message-Id: <1458311463-28272-13-git-send-email-berrange@redhat.com> In-Reply-To: <1458311463-28272-1-git-send-email-berrange@redhat.com> References: <1458311463-28272-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v5 12/28] 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: Amit Shah , "Dr. David Alan Gilbert" , Juan Quintela 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. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrange --- migration/Makefile.objs | 4 +- migration/migration.c | 4 ++ migration/unix.c | 119 +++++++++++++++++++++++++++--------------------- trace-events | 5 ++ 4 files changed, 79 insertions(+), 53 deletions(-) diff --git a/migration/Makefile.objs b/migration/Makefile.objs index b357e2f..a5f8a03 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-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 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 51e28b7..909a399 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -314,8 +314,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 @@ -1063,8 +1065,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 b3537fd..f24a058 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-2016 * * 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,87 +18,103 @@ #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" +#include "trace.h" -//#define DEBUG_MIGRATION_UNIX -#ifdef DEBUG_MIGRATION_UNIX -#define DPRINTF(fmt, ...) \ - do { printf("migration-unix: " fmt, ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) \ - do { } while (0) -#endif +static SocketAddress *unix_build_address(const char *path) +{ + SocketAddress *saddr; + + saddr = g_new0(SocketAddress, 1); + saddr->type = SOCKET_ADDRESS_KIND_UNIX; + saddr->u.q_unix = g_new0(UnixSocketAddress, 1); + saddr->u.q_unix->path = g_strdup(path); + + return saddr; +} -static void unix_wait_for_connect(int fd, Error *err, void *opaque) + +static void unix_outgoing_migration(Object *src, + Error *err, + gpointer opaque) { MigrationState *s = opaque; + QIOChannel *sioc = QIO_CHANNEL(src); - if (fd < 0) { - DPRINTF("migrate connect error: %s\n", error_get_pretty(err)); + if (err) { + trace_migration_unix_outgoing_error(error_get_pretty(err)); s->to_dst_file = NULL; migrate_fd_error(s, err); } else { - DPRINTF("migrate connect success\n"); - s->to_dst_file = qemu_fopen_socket(fd, "wb"); - migrate_fd_connect(s); + trace_migration_unix_outgoing_connected(); + migration_set_outgoing_channel(s, sioc); } + 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); - - DPRINTF("accepted migration\n"); - - if (c < 0) { - error_report("could not accept migration connection (%s)", - strerror(err)); - return; - } + QIOChannelSocket *sioc; + Error *err = NULL; - f = qemu_fopen_socket(c, "rb"); - if (f == NULL) { - error_report("could not qemu_fopen socket"); + sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), + &err); + if (!sioc) { + error_report("could not accept migration connection (%s)", + error_get_pretty(err)); goto out; } - process_incoming_migration(f); - return; + trace_migration_unix_incoming_accepted(); + + migration_set_incoming_channel(migrate_get_current(), + QIO_CHANNEL(sioc)); + object_unref(OBJECT(sioc)); out: - close(c); + /* Close listening socket as its no longer needed */ + qio_channel_close(ioc, NULL); + return FALSE; /* unregister */ } + 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); } diff --git a/trace-events b/trace-events index 8a29e94..eea1d40 100644 --- a/trace-events +++ b/trace-events @@ -1597,6 +1597,11 @@ postcopy_ram_incoming_cleanup_entry(void) "" postcopy_ram_incoming_cleanup_exit(void) "" postcopy_ram_incoming_cleanup_join(void) "" +# migration/unix.c +migration_unix_incoming_accepted(void) "" +migration_unix_outgoing_connected(void) "" +migration_unix_outgoing_error(const char *err) "error=%s" + # kvm-all.c kvm_ioctl(int type, void *arg) "type 0x%x, arg %p" kvm_vm_ioctl(int type, void *arg) "type 0x%x, arg %p" -- 2.5.0