From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZK2X-00088H-8E for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:10:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZK2W-0002ig-7u for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:10:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZK2V-0002iY-LB for qemu-devel@nongnu.org; Fri, 26 Feb 2016 10:10:44 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 64BF77EBC4 for ; Fri, 26 Feb 2016 15:10:43 +0000 (UTC) From: "Daniel P. Berrange" Date: Fri, 26 Feb 2016 15:10:08 +0000 Message-Id: <1456499430-8558-6-git-send-email-berrange@redhat.com> In-Reply-To: <1456499430-8558-1-git-send-email-berrange@redhat.com> References: <1456499430-8558-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v3 05/27] migration: introduce set_blocking function in QEMUFileOps List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , "Dr. David Alan Gilbert" , Juan Quintela 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 Signed-off-by: Daniel P. Berrange --- 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 fc5e50b..2b6fc83 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -413,11 +413,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