From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUG0D-00055c-9I for qemu-devel@nongnu.org; Fri, 12 Feb 2016 10:51:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUG09-0007A6-P6 for qemu-devel@nongnu.org; Fri, 12 Feb 2016 10:51:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUG09-0007A0-Kl for qemu-devel@nongnu.org; Fri, 12 Feb 2016 10:51:21 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3E077552E6 for ; Fri, 12 Feb 2016 15:51:21 +0000 (UTC) Date: Fri, 12 Feb 2016 15:51:17 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20160212155117.GF2411@work-vm> References: <1452599056-27357-1-git-send-email-berrange@redhat.com> <1452599056-27357-23-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1452599056-27357-23-git-send-email-berrange@redhat.com> Subject: Re: [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: "Daniel P. Berrange" Cc: Amit Shah , qemu-devel@nongnu.org, Juan Quintela * Daniel P. Berrange (berrange@redhat.com) wrote: > 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 Reviewed-by: Dr. David Alan Gilbert Dave > --- > 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 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK