diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-02-03 10:59:39 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:46 +0100 |
| commit | e5a9c114f6e3cb3eab6826b222e6eb1f88ef0b4e (patch) | |
| tree | f82b4aafd08f7f99e91a0e81d54b55698c39c5f4 | |
| parent | e95bc544fe31a2a32b46b4dd37ca5ac3e69011bb (diff) | |
| download | spice-e5a9c114f6e3cb3eab6826b222e6eb1f88ef0b4e.tar.gz spice-e5a9c114f6e3cb3eab6826b222e6eb1f88ef0b4e.tar.xz spice-e5a9c114f6e3cb3eab6826b222e6eb1f88ef0b4e.zip | |
Add RedsState arg to reds_set_migration_dest_info()
| -rw-r--r-- | server/reds.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/reds.c b/server/reds.c index 86c08420..1ef70697 100644 --- a/server/reds.c +++ b/server/reds.c @@ -3708,7 +3708,8 @@ SPICE_GNUC_VISIBLE int spice_server_set_agent_file_xfer(SpiceServer *s, int enab } /* returns FALSE if info is invalid */ -static int reds_set_migration_dest_info(const char* dest, +static int reds_set_migration_dest_info(RedsState *reds, + const char* dest, int port, int secure_port, const char* cert_subject) { @@ -3751,7 +3752,7 @@ SPICE_GNUC_VISIBLE int spice_server_migrate_connect(SpiceServer *s, const char* sif = SPICE_CONTAINEROF(s->migration_interface->base.sif, SpiceMigrateInterface, base); - if (!reds_set_migration_dest_info(dest, port, secure_port, cert_subject)) { + if (!reds_set_migration_dest_info(s, dest, port, secure_port, cert_subject)) { sif->migrate_connect_complete(s->migration_interface); return -1; } @@ -3790,9 +3791,8 @@ SPICE_GNUC_VISIBLE int spice_server_migrate_info(SpiceServer *s, const char* des { spice_info(NULL); spice_assert(!s->migration_interface); - spice_assert(reds == s); - if (!reds_set_migration_dest_info(dest, port, secure_port, cert_subject)) { + if (!reds_set_migration_dest_info(s, dest, port, secure_port, cert_subject)) { return -1; } return 0; |