[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/28] migration: introduce set_blocking function
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v4 06/28] migration: introduce set_blocking function in QEMUFileOps |
Date: |
Fri, 11 Mar 2016 16:37:40 +0000 |
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 <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
include/migration/qemu-file.h | 5 +++++
migration/migration.c | 4 +---
migration/qemu-file.c | 10 +++++++---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
index 1934a64..2dea81f 100644
--- a/include/migration/qemu-file.h
+++ b/include/migration/qemu-file.h
@@ -54,6 +54,10 @@ typedef int (QEMUFileCloseFunc)(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
* of the data or return a negative errno value.
@@ -107,6 +111,7 @@ typedef struct QEMUFileOps {
QEMUFileGetBufferFunc *get_buffer;
QEMUFileCloseFunc *close;
QEMUFileGetFD *get_fd;
+ QEMUFileSetBlocking *set_blocking;
QEMUFileWritevBufferFunc *writev_buffer;
QEMURetPathFunc *get_return_path;
QEMUFileShutdownFunc *shut_down;
diff --git a/migration/migration.c b/migration/migration.c
index 7d13377..942c22d 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);
}
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index b480b72..2b25dec 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -684,9 +684,13 @@ size_t qemu_get_counted_string(QEMUFile *f, char buf[256])
*/
void qemu_file_set_blocking(QEMUFile *f, bool block)
{
- if (block) {
- qemu_set_block(qemu_get_fd(f));
+ if (f->ops->set_blocking) {
+ f->ops->set_blocking(f->opaque, block);
} 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));
+ }
}
}
--
2.5.0
- [Qemu-devel] [PATCH v4 00/28] Convert migration to QIOChannel & support TLS, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 01/28] s390: use FILE instead of QEMUFile for creating text file, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 04/28] migration: ensure qemu_fflush() always writes full data amount, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 02/28] io: avoid double-free when closing QIOChannelBuffer, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 03/28] migration: remove use of qemu_bufopen from vmstate tests, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 06/28] migration: introduce set_blocking function in QEMUFileOps,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v4 05/28] migration: split migration hooks out of QEMUFileOps, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 08/28] migration: introduce a new QEMUFile impl based on QIOChannel, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 07/28] migration: force QEMUFile to blocking mode for outgoing migration, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 10/28] migration: add reporting of errors for outgoing migration, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 11/28] migration: convert post-copy to use QIOChannelBuffer, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 09/28] migration: add helpers for creating QEMUFile from a QIOChannel, Daniel P. Berrange, 2016/03/11
- [Qemu-devel] [PATCH v4 12/28] migration: convert unix socket protocol to use QIOChannel, Daniel P. Berrange, 2016/03/11