[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/19] migration: Remove MigrationState from migrati
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 04/19] migration: Remove MigrationState from migration_channel_incomming() |
Date: |
Mon, 17 Apr 2017 22:00:26 +0200 |
All callers were calling migrate_get_current(), so do it inside the function.
Signed-off-by: Juan Quintela <address@hidden>
---
include/migration/channel.h | 3 +--
migration/channel.c | 5 +++--
migration/exec.c | 2 +-
migration/fd.c | 2 +-
migration/socket.c | 3 +--
migration/tls.c | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/include/migration/channel.h b/include/migration/channel.h
index 618acb7..fbc4bfb 100644
--- a/include/migration/channel.h
+++ b/include/migration/channel.h
@@ -16,8 +16,7 @@
#include "io/channel.h"
-void migration_channel_process_incoming(MigrationState *s,
- QIOChannel *ioc);
+void migration_channel_process_incoming(QIOChannel *ioc);
void migration_channel_connect(MigrationState *s,
QIOChannel *ioc,
diff --git a/migration/channel.c b/migration/channel.c
index c66c6db..6f11a1a 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -20,9 +20,10 @@
#include "qapi/error.h"
#include "io/channel-tls.h"
-void migration_channel_process_incoming(MigrationState *s,
- QIOChannel *ioc)
+void migration_channel_process_incoming(QIOChannel *ioc)
{
+ MigrationState *s = migrate_get_current();
+
trace_migration_set_incoming_channel(
ioc, object_get_typename(OBJECT(ioc)));
diff --git a/migration/exec.c b/migration/exec.c
index 7d13fc3..2779c9c 100644
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -48,7 +48,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel
*ioc,
GIOCondition condition,
gpointer opaque)
{
- migration_channel_process_incoming(migrate_get_current(), ioc);
+ migration_channel_process_incoming(ioc);
object_unref(OBJECT(ioc));
return FALSE; /* unregister */
}
diff --git a/migration/fd.c b/migration/fd.c
index f9c230e..fba3852 100644
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -48,7 +48,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc,
GIOCondition condition,
gpointer opaque)
{
- migration_channel_process_incoming(migrate_get_current(), ioc);
+ migration_channel_process_incoming(ioc);
object_unref(OBJECT(ioc));
return FALSE; /* unregister */
}
diff --git a/migration/socket.c b/migration/socket.c
index 7171635..b06cde3 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -149,8 +149,7 @@ static gboolean socket_accept_incoming_migration(QIOChannel
*ioc,
trace_migration_socket_incoming_accepted();
qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming");
- migration_channel_process_incoming(migrate_get_current(),
- QIO_CHANNEL(sioc));
+ migration_channel_process_incoming(QIO_CHANNEL(sioc));
object_unref(OBJECT(sioc));
out:
diff --git a/migration/tls.c b/migration/tls.c
index 4ee3349..2b28ebd 100644
--- a/migration/tls.c
+++ b/migration/tls.c
@@ -73,7 +73,7 @@ static void migration_tls_incoming_handshake(QIOTask *task,
error_report_err(err);
} else {
trace_migration_tls_incoming_handshake_complete();
- migration_channel_process_incoming(migrate_get_current(), ioc);
+ migration_channel_process_incoming(ioc);
}
object_unref(OBJECT(ioc));
}
--
2.9.3
- [Qemu-devel] [PATCH 00/19] Migration cleanup, Juan Quintela, 2017/04/17
- [Qemu-devel] [PATCH 02/19] migration: They are called vmstate_foo, move them to vmstate.c, Juan Quintela, 2017/04/17
- [Qemu-devel] [PATCH 01/19] migration: to_dst_file at that point is NULL, Juan Quintela, 2017/04/17
- [Qemu-devel] [PATCH 03/19] migration: Split migration/channel.c for channel operations, Juan Quintela, 2017/04/17
- [Qemu-devel] [PATCH 04/19] migration: Remove MigrationState from migration_channel_incomming(),
Juan Quintela <=
- [Qemu-devel] [PATCH 05/19] migration: Export exec.c functions in its own file, Juan Quintela, 2017/04/17
- [Qemu-devel] [PATCH 06/19] migration: Export fd.c functions in its own file, Juan Quintela, 2017/04/17
- [Qemu-devel] [PATCH 07/19] migration: Export socket.c functions in its own file, Juan Quintela, 2017/04/17
- [Qemu-devel] [PATCH 08/19] migration: Export tls.c functions in its own file, Juan Quintela, 2017/04/17
- [Qemu-devel] [PATCH 09/19] migration: Create block capabilities for shared and enable, Juan Quintela, 2017/04/17