summary refs log tree commit diff stats
path: root/migration/migration.c
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-04-27 11:04:56 +0100
committerAmit Shah <amit.shah@redhat.com>2016-05-26 11:31:19 +0530
commit06ad513532b1a6085abf4a5dab15d1a4719f715c (patch)
treed61b4d6126e2f980e27eaf04bbdc395f4d5459c4 /migration/migration.c
parent0436e09f9654dfa6f7439531bf443b1f78870ed6 (diff)
downloadfocaccia-qemu-06ad513532b1a6085abf4a5dab15d1a4719f715c.tar.gz
focaccia-qemu-06ad513532b1a6085abf4a5dab15d1a4719f715c.zip
migration: introduce set_blocking function in QEMUFileOps
Remove the assumption that every QEMUFile implementation has
a file descriptor available by introducing a new function
in QEMUFileOps to change the blocking state of a QEMUFile.

If not set, it will fallback to the original code using
the get_fd method.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <1461751518-12128-7-git-send-email-berrange@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Diffstat (limited to 'migration/migration.c')
-rw-r--r--migration/migration.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/migration/migration.c b/migration/migration.c
index f5327e8c0a..ac7790f8af 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -422,11 +422,9 @@ static void process_incoming_migration_co(void *opaque)
 void process_incoming_migration(QEMUFile *f)
 {
     Coroutine *co = qemu_coroutine_create(process_incoming_migration_co);
-    int fd = qemu_get_fd(f);
 
-    assert(fd != -1);
     migrate_decompress_threads_create();
-    qemu_set_nonblock(fd);
+    qemu_file_set_blocking(f, false);
     qemu_coroutine_enter(co, f);
 }