OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: rename unix.c to socket.c

Browse Source 
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 <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1461751518-12128-14-git-send-email-berrange@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-04-27 11:05:03 +01:00 committed by Amit Shah
parent d984464eb9
commit 6f860ae755
3 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration/Makefile.objs
View File

@ -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 += 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.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o
common-obj-y += qemu-file-channel.o common-obj-y += qemu-file-channel.o

53
migration/unix.c → migration/socket.c
View File

@ -38,42 +38,49 @@ static SocketAddress *unix_build_address(const char *path)
} }
static void unix_outgoing_migration(Object *src, static void socket_outgoing_migration(Object *src,
Error *err, Error *err,
gpointer opaque) gpointer opaque)
{ {
MigrationState *s = opaque; MigrationState *s = opaque;
QIOChannel *sioc = QIO_CHANNEL(src); QIOChannel *sioc = QIO_CHANNEL(src);
if (err) { if (err) {
trace_migration_unix_outgoing_error(error_get_pretty(err)); trace_migration_socket_outgoing_error(error_get_pretty(err));
s->to_dst_file = NULL; s->to_dst_file = NULL;
migrate_fd_error(s, err); migrate_fd_error(s, err);
} else { } else {
trace_migration_unix_outgoing_connected(); trace_migration_socket_outgoing_connected();
migration_set_outgoing_channel(s, sioc); migration_set_outgoing_channel(s, sioc);
} }
object_unref(src); object_unref(src);
} }
static void socket_start_outgoing_migration(MigrationState *s,
void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp) SocketAddress *saddr,
Error **errp)
{ {
SocketAddress *saddr = unix_build_address(path); QIOChannelSocket *sioc = qio_channel_socket_new();
QIOChannelSocket *sioc;
sioc = qio_channel_socket_new();
qio_channel_socket_connect_async(sioc, qio_channel_socket_connect_async(sioc,
saddr, saddr,
unix_outgoing_migration, socket_outgoing_migration,
s, s,
NULL); NULL);
qapi_free_SocketAddress(saddr); 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 unix_accept_incoming_migration(QIOChannel *ioc,
GIOCondition condition, static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
gpointer opaque) GIOCondition condition,
gpointer opaque)
{ {
QIOChannelSocket *sioc; QIOChannelSocket *sioc;
Error *err = NULL; Error *err = NULL;
@ -86,7 +93,7 @@ static gboolean unix_accept_incoming_migration(QIOChannel *ioc,
goto out; goto out;
} }
trace_migration_unix_incoming_accepted(); trace_migration_socket_incoming_accepted();
migration_set_incoming_channel(migrate_get_current(), migration_set_incoming_channel(migrate_get_current(),
QIO_CHANNEL(sioc)); QIO_CHANNEL(sioc));
@ -99,12 +106,11 @@ out:
} }
void unix_start_incoming_migration(const char *path, Error **errp) static void socket_start_incoming_migration(SocketAddress *saddr,
Error **errp)
{ {
SocketAddress *saddr = unix_build_address(path); QIOChannelSocket *listen_ioc = qio_channel_socket_new();
QIOChannelSocket *listen_ioc;
listen_ioc = qio_channel_socket_new();
if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) { if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) {
object_unref(OBJECT(listen_ioc)); object_unref(OBJECT(listen_ioc));
qapi_free_SocketAddress(saddr); qapi_free_SocketAddress(saddr);
@ -113,9 +119,14 @@ void unix_start_incoming_migration(const char *path, Error **errp)
qio_channel_add_watch(QIO_CHANNEL(listen_ioc), qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
G_IO_IN, G_IO_IN,
unix_accept_incoming_migration, socket_accept_incoming_migration,
listen_ioc, listen_ioc,
(GDestroyNotify)object_unref); (GDestroyNotify)object_unref);
qapi_free_SocketAddress(saddr); 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);
}

8
trace-events
View File

@ -1595,10 +1595,10 @@ postcopy_ram_incoming_cleanup_entry(void) ""
postcopy_ram_incoming_cleanup_exit(void) "" postcopy_ram_incoming_cleanup_exit(void) ""
postcopy_ram_incoming_cleanup_join(void) "" postcopy_ram_incoming_cleanup_join(void) ""
# migration/unix.c # migration/socket.c
migration_unix_incoming_accepted(void) "" migration_socket_incoming_accepted(void) ""
migration_unix_outgoing_connected(void) "" migration_socket_outgoing_connected(void) ""
migration_unix_outgoing_error(const char *err) "error=%s" migration_socket_outgoing_error(const char *err) "error=%s"
# kvm-all.c # kvm-all.c
kvm_ioctl(int type, void *arg) "type 0x%x, arg %p" kvm_ioctl(int type, void *arg) "type 0x%x, arg %p"