From: Daniel P. Berrange Date: Wed, 27 Apr 2016 10:05:03 +0000 (+0100) Subject: migration: rename unix.c to socket.c X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f860ae75566e858593d2c067909a6d1e9feccbf;p=qemu.git migration: rename unix.c to socket.c The unix.c file will be nearly the same as the tcp.c file, only differing in the initial SocketAddress creation code. Rename unix.c to socket.c and refactor it a little to prepare for merging the TCP code. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrange Message-Id: <1461751518-12128-14-git-send-email-berrange@redhat.com> Signed-off-by: Amit Shah --- diff --git a/migration/Makefile.objs b/migration/Makefile.objs index ad7fed95e7..b0b9550916 100644 --- a/migration/Makefile.objs +++ b/migration/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y += migration.o tcp.o unix.o +common-obj-y += migration.o tcp.o socket.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 diff --git a/migration/socket.c b/migration/socket.c new file mode 100644 index 0000000000..a9911d6591 --- /dev/null +++ b/migration/socket.c @@ -0,0 +1,132 @@ +/* + * QEMU live migration via Unix Domain Sockets + * + * 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. + * + * Contributions after 2012-01-13 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + */ + +#include "qemu/osdep.h" + +#include "qemu-common.h" +#include "qemu/error-report.h" +#include "qapi/error.h" +#include "migration/migration.h" +#include "migration/qemu-file.h" +#include "io/channel-socket.h" +#include "trace.h" + + +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.data = g_new0(UnixSocketAddress, 1); + saddr->u.q_unix.data->path = g_strdup(path); + + return saddr; +} + + +static void socket_outgoing_migration(Object *src, + Error *err, + gpointer opaque) +{ + MigrationState *s = opaque; + QIOChannel *sioc = QIO_CHANNEL(src); + + if (err) { + trace_migration_socket_outgoing_error(error_get_pretty(err)); + s->to_dst_file = NULL; + migrate_fd_error(s, err); + } else { + trace_migration_socket_outgoing_connected(); + migration_set_outgoing_channel(s, sioc); + } + object_unref(src); +} + +static void socket_start_outgoing_migration(MigrationState *s, + SocketAddress *saddr, + Error **errp) +{ + QIOChannelSocket *sioc = qio_channel_socket_new(); + qio_channel_socket_connect_async(sioc, + saddr, + socket_outgoing_migration, + s, + NULL); + qapi_free_SocketAddress(saddr); +} + +void unix_start_outgoing_migration(MigrationState *s, + const char *path, + Error **errp) +{ + SocketAddress *saddr = unix_build_address(path); + socket_start_outgoing_migration(s, saddr, errp); +} + + +static gboolean socket_accept_incoming_migration(QIOChannel *ioc, + GIOCondition condition, + gpointer opaque) +{ + QIOChannelSocket *sioc; + Error *err = NULL; + + 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; + } + + trace_migration_socket_incoming_accepted(); + + migration_set_incoming_channel(migrate_get_current(), + QIO_CHANNEL(sioc)); + object_unref(OBJECT(sioc)); + +out: + /* Close listening socket as its no longer needed */ + qio_channel_close(ioc, NULL); + return FALSE; /* unregister */ +} + + +static void socket_start_incoming_migration(SocketAddress *saddr, + Error **errp) +{ + QIOChannelSocket *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; + } + + qio_channel_add_watch(QIO_CHANNEL(listen_ioc), + G_IO_IN, + socket_accept_incoming_migration, + listen_ioc, + (GDestroyNotify)object_unref); + qapi_free_SocketAddress(saddr); +} + +void unix_start_incoming_migration(const char *path, Error **errp) +{ + SocketAddress *saddr = unix_build_address(path); + socket_start_incoming_migration(saddr, errp); +} diff --git a/migration/unix.c b/migration/unix.c deleted file mode 100644 index 75205d42ea..0000000000 --- a/migration/unix.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * QEMU live migration via Unix Domain Sockets - * - * 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. - * - * Contributions after 2012-01-13 are licensed under the terms of the - * GNU GPL, version 2 or (at your option) any later version. - */ - -#include "qemu/osdep.h" - -#include "qemu-common.h" -#include "qemu/error-report.h" -#include "qapi/error.h" -#include "migration/migration.h" -#include "migration/qemu-file.h" -#include "io/channel-socket.h" -#include "trace.h" - - -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.data = g_new0(UnixSocketAddress, 1); - saddr->u.q_unix.data->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 (err) { - trace_migration_unix_outgoing_error(error_get_pretty(err)); - s->to_dst_file = NULL; - migrate_fd_error(s, err); - } else { - 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) -{ - 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 gboolean unix_accept_incoming_migration(QIOChannel *ioc, - GIOCondition condition, - gpointer opaque) -{ - QIOChannelSocket *sioc; - Error *err = NULL; - - 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; - } - - trace_migration_unix_incoming_accepted(); - - migration_set_incoming_channel(migrate_get_current(), - QIO_CHANNEL(sioc)); - object_unref(OBJECT(sioc)); - -out: - /* 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) -{ - SocketAddress *saddr = unix_build_address(path); - QIOChannelSocket *listen_ioc; - - 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; - } - - 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 df4530d486..62f634d0e0 100644 --- a/trace-events +++ b/trace-events @@ -1595,10 +1595,10 @@ 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" +# migration/socket.c +migration_socket_incoming_accepted(void) "" +migration_socket_outgoing_connected(void) "" +migration_socket_outgoing_error(const char *err) "error=%s" # kvm-all.c kvm_ioctl(int type, void *arg) "type 0x%x, arg %p"