[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 13/28] migration: rename unix.c to socket.c
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v5 13/28] migration: rename unix.c to socket.c |
Date: |
Fri, 18 Mar 2016 14:30:48 +0000 |
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 <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
migration/Makefile.objs | 2 +-
migration/{unix.c => socket.c} | 53 +++++++++++++++++++++++++-----------------
trace-events | 8 +++----
3 files changed, 37 insertions(+), 26 deletions(-)
rename migration/{unix.c => socket.c} (65%)
diff --git a/migration/Makefile.objs b/migration/Makefile.objs
index a5f8a03..9d83997 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/unix.c b/migration/socket.c
similarity index 65%
rename from migration/unix.c
rename to migration/socket.c
index f24a058..ef0a673 100644
--- a/migration/unix.c
+++ b/migration/socket.c
@@ -37,42 +37,49 @@ static SocketAddress *unix_build_address(const char *path)
}
-static void unix_outgoing_migration(Object *src,
- Error *err,
- gpointer opaque)
+static void socket_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));
+ trace_migration_socket_outgoing_error(error_get_pretty(err));
s->to_dst_file = NULL;
migrate_fd_error(s, err);
} else {
- trace_migration_unix_outgoing_connected();
+ trace_migration_socket_outgoing_connected();
migration_set_outgoing_channel(s, sioc);
}
object_unref(src);
}
-
-void unix_start_outgoing_migration(MigrationState *s, const char *path, Error
**errp)
+static void socket_start_outgoing_migration(MigrationState *s,
+ SocketAddress *saddr,
+ Error **errp)
{
- SocketAddress *saddr = unix_build_address(path);
- QIOChannelSocket *sioc;
- sioc = qio_channel_socket_new();
+ QIOChannelSocket *sioc = qio_channel_socket_new();
qio_channel_socket_connect_async(sioc,
saddr,
- unix_outgoing_migration,
+ 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 unix_accept_incoming_migration(QIOChannel *ioc,
- GIOCondition condition,
- gpointer opaque)
+static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
+ GIOCondition condition,
+ gpointer opaque)
{
QIOChannelSocket *sioc;
Error *err = NULL;
@@ -85,7 +92,7 @@ static gboolean unix_accept_incoming_migration(QIOChannel
*ioc,
goto out;
}
- trace_migration_unix_incoming_accepted();
+ trace_migration_socket_incoming_accepted();
migration_set_incoming_channel(migrate_get_current(),
QIO_CHANNEL(sioc));
@@ -98,12 +105,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;
+ QIOChannelSocket *listen_ioc = qio_channel_socket_new();
- 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);
@@ -112,9 +118,14 @@ void unix_start_incoming_migration(const char *path, Error
**errp)
qio_channel_add_watch(QIO_CHANNEL(listen_ioc),
G_IO_IN,
- unix_accept_incoming_migration,
+ 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/trace-events b/trace-events
index eea1d40..00d3073 100644
--- a/trace-events
+++ b/trace-events
@@ -1597,10 +1597,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"
--
2.5.0
- [Qemu-devel] [PATCH v5 03/28] migration: remove use of qemu_bufopen from vmstate tests, (continued)
- [Qemu-devel] [PATCH v5 03/28] migration: remove use of qemu_bufopen from vmstate tests, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 02/28] io: avoid double-free when closing QIOChannelBuffer, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 05/28] migration: split migration hooks out of QEMUFileOps, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 08/28] migration: introduce a new QEMUFile impl based on QIOChannel, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 06/28] migration: introduce set_blocking function in QEMUFileOps, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 07/28] migration: force QEMUFile to blocking mode for outgoing migration, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 09/28] migration: add helpers for creating QEMUFile from a QIOChannel, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 10/28] migration: add reporting of errors for outgoing migration, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 12/28] migration: convert unix socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 11/28] migration: convert post-copy to use QIOChannelBuffer, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 13/28] migration: rename unix.c to socket.c,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v5 15/28] migration: convert fd socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 16/28] migration: convert exec socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 14/28] migration: convert tcp socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 18/28] migration: convert savevm to use QIOChannel for writing to files, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 17/28] migration: convert RDMA to use QIOChannel interface, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 19/28] migration: delete QEMUFile buffer implementation, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 21/28] migration: delete QEMUFile sockets implementation, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 20/28] migration: delete QEMUSizedBuffer struct, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 23/28] migration: move definition of struct QEMUFile back into qemu-file.c, Daniel P. Berrange, 2016/03/18
- [Qemu-devel] [PATCH v5 22/28] migration: delete QEMUFile stdio implementation, Daniel P. Berrange, 2016/03/18