From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIxNl-00021l-5g for qemu-devel@nongnu.org; Tue, 12 Jan 2016 06:45:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIxNk-0004MZ-BZ for qemu-devel@nongnu.org; Tue, 12 Jan 2016 06:45:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIxNk-0004MH-7Y for qemu-devel@nongnu.org; Tue, 12 Jan 2016 06:45:00 -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 D3EFE8DFED for ; Tue, 12 Jan 2016 11:44:59 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 12 Jan 2016 11:44:16 +0000 Message-Id: <1452599056-27357-23-git-send-email-berrange@redhat.com> In-Reply-To: <1452599056-27357-1-git-send-email-berrange@redhat.com> References: <1452599056-27357-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v1 22/22] migration: remove qemu_get_fd method from QEMUFile 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 Now that there is a set_blocking callback in QEMUFileOps, and all users needing non-blocking support have been converted to QIOChannel, there is no longer any codepath requiring the qemu_get_fd() method for QEMUFile. Remove it to avoid further code being introduced with an expectation of direct file handle access. Signed-off-by: Daniel P. Berrange --- include/migration/qemu-file.h | 1 - migration/qemu-file.c | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 4ee40e4..68bc165 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -104,7 +104,6 @@ typedef int (QEMUFileShutdownFunc)(void *opaque, bool rd, bool wr); typedef struct QEMUFileOps { QEMUFileGetBufferFunc *get_buffer; QEMUFileCloseFunc *close; - QEMUFileGetFD *get_fd; QEMUFileSetBlocking *set_blocking; QEMUFileWritevBufferFunc *writev_buffer; QEMURetPathFunc *get_return_path; diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 372a6b9..baef865 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -267,14 +267,6 @@ static ssize_t qemu_fill_buffer(QEMUFile *f) return len; } -int qemu_get_fd(QEMUFile *f) -{ - if (f->ops->get_fd) { - return f->ops->get_fd(f->opaque); - } - return -1; -} - void qemu_update_position(QEMUFile *f, size_t size) { f->pos += size; @@ -687,11 +679,5 @@ void qemu_file_set_blocking(QEMUFile *f, bool block) { if (f->ops->set_blocking) { f->ops->set_blocking(f->opaque, block); - } else { - if (block) { - qemu_set_block(qemu_get_fd(f)); - } else { - qemu_set_nonblock(qemu_get_fd(f)); - } } } -- 2.5.0