From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5C01-0005hj-W3 for qemu-devel@nongnu.org; Wed, 17 Jun 2015 07:59:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5Bzz-00078f-7T for qemu-devel@nongnu.org; Wed, 17 Jun 2015 07:59:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Bzz-00078O-2d for qemu-devel@nongnu.org; Wed, 17 Jun 2015 07:59:19 -0400 From: Juan Quintela In-Reply-To: <1434450415-11339-7-git-send-email-dgilbert@redhat.com> (David Alan Gilbert's message of "Tue, 16 Jun 2015 11:26:19 +0100") References: <1434450415-11339-1-git-send-email-dgilbert@redhat.com> <1434450415-11339-7-git-send-email-dgilbert@redhat.com> Date: Wed, 17 Jun 2015 13:59:16 +0200 Message-ID: <87d20u5ywb.fsf@neno.neno> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v7 06/42] Add wrapper for setting blocking status on a QEMUFile Reply-To: quintela@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, liang.z.li@intel.com, qemu-devel@nongnu.org, luis@cs.umu.se, amit.shah@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au "Dr. David Alan Gilbert (git)" wrote: > From: "Dr. David Alan Gilbert" > > Add a wrapper to change the blocking status on a QEMUFile > rather than having to use qemu_set_block(qemu_get_fd(f)); > it seems best to avoid exposing the fd since not all QEMUFile's > really have one. With this wrapper we could move the implementation > down to be different on different transports. > > Signed-off-by: Dr. David Alan Gilbert > Reviewed-by: Amit Shah Reviewed-by: Juan Quintela Can we improve naming? > --- > include/migration/qemu-file.h | 1 + > migration/qemu-file.c | 15 +++++++++++++++ > 2 files changed, 16 insertions(+) > > diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h > index 29a9d69..d43c835 100644 > --- a/include/migration/qemu-file.h > +++ b/include/migration/qemu-file.h > @@ -193,6 +193,7 @@ int qemu_file_get_error(QEMUFile *f); > void qemu_file_set_error(QEMUFile *f, int ret); > int qemu_file_shutdown(QEMUFile *f); > void qemu_fflush(QEMUFile *f); > +void qemu_file_change_blocking(QEMUFile *f, bool block); > > static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv) > { > diff --git a/migration/qemu-file.c b/migration/qemu-file.c > index c111a6b..c746129 100644 > --- a/migration/qemu-file.c > +++ b/migration/qemu-file.c > @@ -651,3 +651,18 @@ size_t qemu_get_counted_string(QEMUFile *f, char buf[256]) > > return res == len ? res : 0; > } > + > +/* > + * Change the blocking state of the QEMUFile. > + * Note: On some transports the OS only keeps a single blocking state for > + * both directions, and thus changing the blocking on the main > + * QEMUFile can also affect the return path. > + */ > +void qemu_file_change_blocking(QEMUFile *f, bool block) qemu_file_set_blocking? It don't change the blocking, it just do whatever block says? > +{ > + if (block) { > + qemu_set_block(qemu_get_fd(f)); > + } else { > + qemu_set_nonblock(qemu_get_fd(f)); > + } > +}