ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Remove MigrationState from migration_channel_incomming() 

All callers were calling migrate_get_current(), so do it inside the function.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
This commit is contained in:
Juan Quintela 2017-04-17 17:15:02 +02:00
parent c8f9f4f402
commit 543147116e
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
migration/channel.c
View File

@ -19,9 +19,10 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "io/channel-tls.h" #include "io/channel-tls.h"
void migration_channel_process_incoming(MigrationState *s, void migration_channel_process_incoming(QIOChannel *ioc)
QIOChannel *ioc)
{ {
MigrationState *s = migrate_get_current();
trace_migration_set_incoming_channel( trace_migration_set_incoming_channel(
ioc, object_get_typename(OBJECT(ioc))); ioc, object_get_typename(OBJECT(ioc)));

3
migration/channel.h
View File

@ -18,8 +18,7 @@
#include "io/channel.h" #include "io/channel.h"
void migration_channel_process_incoming(MigrationState *s, void migration_channel_process_incoming(QIOChannel *ioc);
QIOChannel *ioc);
void migration_channel_connect(MigrationState *s, void migration_channel_connect(MigrationState *s,
QIOChannel *ioc, QIOChannel *ioc,

2
migration/exec.c
View File

@ -49,7 +49,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc,
GIOCondition condition, GIOCondition condition,
gpointer opaque) gpointer opaque)
{ {
migration_channel_process_incoming(migrate_get_current(), ioc); migration_channel_process_incoming(ioc);
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
return FALSE; /* unregister */ return FALSE; /* unregister */
} }

2
migration/fd.c
View File

@ -49,7 +49,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc,
GIOCondition condition, GIOCondition condition,
gpointer opaque) gpointer opaque)
{ {
migration_channel_process_incoming(migrate_get_current(), ioc); migration_channel_process_incoming(ioc);
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
return FALSE; /* unregister */ return FALSE; /* unregister */
} }

3
migration/socket.c
View File

@ -148,8 +148,7 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
trace_migration_socket_incoming_accepted(); trace_migration_socket_incoming_accepted();
qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming"); qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming");
migration_channel_process_incoming(migrate_get_current(), migration_channel_process_incoming(QIO_CHANNEL(sioc));
QIO_CHANNEL(sioc));
object_unref(OBJECT(sioc)); object_unref(OBJECT(sioc));
out: out:

2
migration/tls.c
View File

@ -74,7 +74,7 @@ static void migration_tls_incoming_handshake(QIOTask *task,
error_report_err(err); error_report_err(err);
} else { } else {
trace_migration_tls_incoming_handshake_complete(); trace_migration_tls_incoming_handshake_complete();
migration_channel_process_incoming(migrate_get_current(), ioc); migration_channel_process_incoming(ioc);
} }
object_unref(OBJECT(ioc)); object_unref(OBJECT(ioc));
} }