SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration: introduce set_blocking function in QEMUFileOps

Browse Source 
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>
This commit is contained in:
Daniel P. Berrange 2016-04-27 11:04:56 +01:00 committed by Amit Shah
parent 0436e09f96
commit 06ad513532
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/migration/qemu-file.h
View File

@ -54,6 +54,10 @@ typedef int (QEMUFileCloseFunc)(void *opaque);
*/ */
typedef int (QEMUFileGetFD)(void *opaque); typedef int (QEMUFileGetFD)(void *opaque);
/* Called to change the blocking mode of the file
*/
typedef int (QEMUFileSetBlocking)(void *opaque, bool enabled);
/* /*
* This function writes an iovec to file. The handler must write all * This function writes an iovec to file. The handler must write all
* of the data or return a negative errno value. * of the data or return a negative errno value.
@ -107,6 +111,7 @@ typedef struct QEMUFileOps {
QEMUFileGetBufferFunc *get_buffer; QEMUFileGetBufferFunc *get_buffer;
QEMUFileCloseFunc *close; QEMUFileCloseFunc *close;
QEMUFileGetFD *get_fd; QEMUFileGetFD *get_fd;
QEMUFileSetBlocking *set_blocking;
QEMUFileWritevBufferFunc *writev_buffer; QEMUFileWritevBufferFunc *writev_buffer;
QEMURetPathFunc *get_return_path; QEMURetPathFunc *get_return_path;
QEMUFileShutdownFunc *shut_down; QEMUFileShutdownFunc *shut_down;

4
migration/migration.c
View File

@ -422,11 +422,9 @@ static void process_incoming_migration_co(void *opaque)
void process_incoming_migration(QEMUFile *f) void process_incoming_migration(QEMUFile *f)
{ {
Coroutine *co = qemu_coroutine_create(process_incoming_migration_co); Coroutine *co = qemu_coroutine_create(process_incoming_migration_co);
int fd = qemu_get_fd(f);
assert(fd != -1);
migrate_decompress_threads_create(); migrate_decompress_threads_create();
qemu_set_nonblock(fd); qemu_file_set_blocking(f, false);
qemu_coroutine_enter(co, f); qemu_coroutine_enter(co, f);
} }

10
migration/qemu-file.c
View File

@ -684,9 +684,13 @@ size_t qemu_get_counted_string(QEMUFile *f, char buf[256])
*/ */
void qemu_file_set_blocking(QEMUFile *f, bool block) void qemu_file_set_blocking(QEMUFile *f, bool block)
{ {
if (block) { if (f->ops->set_blocking) {
qemu_set_block(qemu_get_fd(f)); f->ops->set_blocking(f->opaque, block);
} else { } else {
qemu_set_nonblock(qemu_get_fd(f)); if (block) {
qemu_set_block(qemu_get_fd(f));
} else {
qemu_set_nonblock(qemu_get_fd(f));
}
} }
} }